Merge "Fix leaking animation" into nyc-dev am: 0822a7e272
am: 33f776dda8

* commit '33f776dda8b8ba2d0c64d31ff0bedc991be7d94b':
  Fix leaking animation