Merge "SurfaceView: Include surfaceInsets in position calculation"