Merge "Remove duplicate getActiveBubbles" into main