Merge "Update Goldens for WMShell Tests" into main