Merge "Update both width and height in BubbleBarView" into main