Merge "Add grid icon for wallpaper picker" into main