Merge "Make DesktopTaskView's icon handling more similar to standard TaskView" into main