Merge "Prevent SurfaceView from drawing over parent surface insets"