Merge "Update the sizes for bubble expanded view" into sc-dev