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

Change-Id: I11160e8e18c6671cbfbb526043b9fe675799db2f