Merge "fix(window magnification): Set the surface of SurfaceView black" into main