Merge "Fix breaking WM screenshot tests" into main