Merge "Fix SurfaceControlViewHostTest activities for edge-to-edge" into main