(no ticket) Various drag-and-drop fixes

Change-Id: Ia1f8d01fbc19529a62983f14e4a43c5e6d001844
Merge "(no ticket) Various drag-and-drop fixes"