[automerger skipped] Merge "Revert "Fix drag and drop (3/3)"" into qt-qpr1-dev am: 72daf56b90 am: df3230708a -s ours
am skip reason: Change-Id I10800ff8f76fa68b9a93c935d14c5ade68504917 with SHA-1 fd9d94d8e3 is in history

Change-Id: Ic0bbfd85b12b23b6800cb0ee04b902660d639a3b