Merge "Update TaskIcon UI." into sc-dev