Merge "Do not overwrite user set or live wallpapers" into main