Merge "Restrict the width of bubble expanded view on large screens" into sc-dev