Merge "Revert "Defer showing the expanded view for bubble bar"" into main