Revert "Fix drag and drop (3/3)"

This reverts commit 6262f22411091d79e49b39dd8a579ba157236194.

Bug: 137819199
Test: manual
Change-Id: I10800ff8f76fa68b9a93c935d14c5ade68504917
4 files changed