Merge "Make wallpaper downloader activity-retained-scoped (2/3)" into main