Merge "Add a unit test for switching bubbles" into main