Merge "Simplify ScreenshotController/ViewProxy interface" into main