Merge "Remove Wallpaper Picker revamped UI flag (3/3)" into main