Merge "Cap the width of the bubble bar when collapsed" into udc-qpr-dev