Merge "Decouple BubbleController from more classes" into main