Merge "Fix group summary suppression logic when without bubbles" into sc-dev