Merge "Fix a bug that SurfaceView loses transformation" into oc-mr1-dev
am: e22ecbdd61

Change-Id: I893e8346ce58b39f1e84a7e38af6a04f11f03800