Merge "Fix `SpaScreenshotTests` by uploading new screenshots." into main