Merge "Move WallpaperData in its own class"