Merge "Passing the TaskDescription to the IconLoader" into pi-dev