(no ticket) Misc drag and drop improvements after OI

Change-Id: I12960bafd4be0780843cd74bf53aca7d5b8b31ae
Merge "(no ticket) Misc drag and drop improvements after OI"