Merge "Use default ScreenshotController for PROVIDED_IMAGE type" into main