Merge "Revert "Ignore `Background for SurfaceView Camera`  surface on test"" into main