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

Change-Id: I9b18f3d94ed768a8c690d2a731dd8bb8037dbdb8