Merge "Fix bubble update animation" into main