Merge "Switch to callback version of ScreenshotActionsProvider" into main