Merge "Move more code into ScreenshotViewProxy" into main