Merge main into v6 and regenerate screenshots ahead of alpha omega release #4052

Closed nicolethoen closed 2 months ago