Merge "Make BubbleBarView initially hidden" into main