Merge "Fix Race in ScreenshotController" into 24D1-dev