Merge "Revert "SurfaceView: Include surfaceInsets in position calculation""