Merge "Adds BubbleControllers to TaskbarControllers" into udc-dev