Merge "Fix Race in ScreenshotController" into main