Merge "Remove DrawingHandler"