Merge "Cleaned up and stabilize ScreenshotTests" into main