Merge "DO NOT MERGE Fixing crash in SystemUI fetching task description icons." into nyc-mr2-dev am: c52a3cb704
am: edf796e8a3  -s ours

Change-Id: Ib22733dbd9018bbe583b0135f66cd4dab29a1238