[automerger skipped] Merge "Revert "Fix drag and drop (2/3)"" into qt-qpr1-dev am: 8b19a05502 am: bb2dd8ea03 -s ours
am skip reason: Change-Id I7afec569519b9c69eb03225672db6db141b20241 with SHA-1 6cbb975915 is in history

Change-Id: I14b47a76b02fb8a1d7615e7be1bfe5aff9253339