Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev