Merge "Fix SurfaceView cts." into oc-dev