Merge "Fix SurfaceView handler." into oc-dev