Merge "Log warning when animator detects NaN value" into jb-mr2-dev