Merge "Fix bubble tx when the bar is collapsed" into main