Merge "Abstract out surface between ScreenshotController and ScreenshotView" into main