Merge "Move wallpaper related methods to WallpaperToken"