Merge "Inset the bubble bar expanded view instead of drawing our own header" into udc-qpr-dev