Merge "Improve SurfaceView bounds calculation" into qt-dev