Merge "Remove wallpaper entry from the option list (2/2)" into main