Merge "Passing the TaskDescription to the IconLoader" into pi-dev
am: 70d4ddece8

Change-Id: Ib2fc996edb48cf0b20a441f5855a3b375b8ba99e