Merge "Fix for Surface#lockHardwareCanvas lockups" into qt-qpr1-dev