Merge "SurfaceView: Fix positioning issue when toggling visibility." into oc-dev