Merge "2b/ Update launcher to use GroupedTaskInfos" into main