Merge "Remove unused deferClearAllDrawn"