Merge "Don't show the bubble bar when it is empty" into udc-qpr-dev