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