Merge "Make animators more robust against ending mid-stream" into jb-mr1-dev