Merge "SurfaceView: Release Surface with SurfaceControl." into oc-dev