Merge "Decouple BubbleController from some bubble classes" into main