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

Change-Id: I297d79d8f5262e68df0c294c938646a0acacbce8