Merge "Revert "Fix drag and drop (2/3)"" into qt-qpr1-dev am: 8b19a05502

Change-Id: I67ec7ef546b5d0bdf954266687955ee8c5f94bf4