Merge "Refactor WallpaperData constructor, make getWallpaperDir static"