Merge "Merge "SurfaceView: Release Surface with SurfaceControl." into oc-dev am: 3630fd4e11 am: 9cbe611f4a"