[automerger skipped] Merge "Revert "Fix drag and drop (1/3)"" into qt-qpr1-dev am: e0f4421f23 am: 6366a55ac8 -s ours
am skip reason: Change-Id If5e8856aad74b6f232fff9d5fd746f56d63288eb with SHA-1 c499ad3775 is in history

Change-Id: Ibc35b78ced89d98cd35992f8ee3cbb9c87ffd065