Merge "SurfaceView: Reset window stopped state when attaching to window." into oc-dev