Merge "Make animations persist after completion." into jb-dev