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

Change-Id: I918abc5c9160c4f0f50b5679b6f8835105c25d84