Merge "Fix drag surface would be stuck (1/2)" into qt-qpr1-dev am: 556bdce162

Change-Id: I989e4f7a160c79a01039d3df309abc4330cefda1