Merge "New switch animation for bubble bar bubbles" into main