Merge "SurfaceView: Release Surfaces where SurfaceControl are released."