Merge "Better separation between DragDriver and DragController" into ub-launcher3-master