Merge "Improve SurfaceView bounds calculation" into qt-dev
am: 70908f6c51

Change-Id: I42ae2c6a6465142f56abfd8b44f9509e9a2c62c5