Fix #14318: Cherry-pick interrupted animation fix from master ea5c22ec12e6a548b1ec2d7b0dcd9f71bea8d5dd