Merge "Revert SurfaceView back to Q's version" into qt-r1-dev
am: 2f8cae24b9

Change-Id: Iedb5910e225fd2584b6b4342dc7aed9b93747eb0