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

Change-Id: Idd8bcb8daad67f575d5988967af75a52fb6f11eb