Merge "Fix bubble bar position on recreate" into main