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

Change-Id: If75a7db07edb2b11c2cf76b3898d84588ea6c635