Merge "Rename: Drop 'Container' from BubbleExpandedViewContainer"