Merge "Moving the state changes during drag-n-drop from startDrag to onDragStart" into ub-launcher3-calgary-polish
am: d1602ddfdf

Change-Id: Ifeb15679c73f9b1b9fc7e5db9acd259577179657