Merge "Improve logic for evaluation/animation interruption" into mnc-dev