Merge "Fix bubble bar and handle visibility on first bubble" into main