Merge "2a/ Generalize GroupedRecentTaskInfo into GroupedTaskInfo" into main