Merge "Add BubbleCoordinator"