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

Change-Id: I91e183c0313e9b0f9fff181cc34399d4bf2fd7f3