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