Merge "Adding the activity icon in wallpaper list"