Merge "Breaking icon update task so that it doesn't block worker thread" into ub-launcher3-burnaby