Merge "Maybe fix transitions for bubbles" into main