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

Change-Id: I5f883c2760e8056d2130d232fb7ca43576339a17