Merge "Fix bubble translation x when bar is collapsed" into main