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

Change-Id: I8c841d11033c9bf18987b59edce0ccf93bb984b9