Merge "Reduce unnecessary collecting for wallpaper with shell transition"