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

Change-Id: I200243684a5a29f9f407d45a2826236bb32056c0