Merge "Refactor of wallpaper methods."