Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev