Moving the state changes during drag-n-drop from startDrag to onDragStart
am: 06e21a2587

Change-Id: I875fcc0b9e38fe86f6898e511671ba392aaa4c1d