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

Change-Id: I1b18f556b4b42f81ddca69ae5ce420d7a612bf6b