Merge "Keep reference to ScreenshotHelper in SystemActions" into main