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

Change-Id: I98b615cd1f52385bb3cdbc4dcc287911f3eabad0