Merge "Extract DisplayState elements into ScreenshotArgs" into main