Merge "Move common code from DesktopTaskView and GroupedTaskView to TaskView" into main