Merge "Fix the flaky screenshot test" into main