Merge "Update bubble bar expanded view sizes" into main