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