Merge "Creates BubbleBarController" into udc-dev