Merge "When a new group summary is added, clean up any ungrouped children" into main