[automerger skipped] Merge "Fix drag surface would be stuck (1/2)" into qt-qpr1-dev am: 556bdce162 am: 63f7141a8d -s ours
am skip reason: Change-Id I382bc1fb04e1f4469df2c512f9e0f2542bbd2390 with SHA-1 b62e500e63 is in history

Change-Id: Ia5c10913e0aa0a3fd4bdc1fd7b0712f59bc384bb