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

Change-Id: Id6fa287aa7c7edb2fd59a3bcbeef2aade35961e7