Merge "Fix handle color when interrupting the animation" into main