Merge "Simplify finding wallpapers" into main