Merge "Refactor parts of BubbleController"