Merge "Fix regression in bubble animation" into main