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

Change-Id: I44d9fbff5eb3928ab7bafed112daef4a6de79a3f