Merge "Use bubble count for checking if bubble bar has bubbles" into main