Merge "SurfaceView: Don't destroy Surface while Stopped." into oc-dev