am 5e9680e9: (-s ours) am d53e22d2: am 4d3f022c: Merge "DO NOT MERGE: Fix leak when animations are created but never started" into jb-ub-now-indigo-rose

* commit '5e9680e976ea61a0d2e957c1f91e6a8a417e89d5':