Merge "Fix to prevent animated tuck repeating." into main