am 255cb779: Merge "Make animations persist after completion." into jb-dev

* commit '255cb7798160a083124cd2033e0619f8b3ed731c':
  Make animations persist after completion.