Merge "Fix bubble manage menu after dismissing bubble" into main