Merge "Revert SurfaceView back to Q's version" into qt-r1-dev