Merge "Use AssistedFactory for ScreenshotViewProxy" into main