Merge "Fix the spacing between bubble bar and expanded view" into udc-qpr-dev