Merge "Show multiple icons for GroupedTaskView" into sc-v2-dev