Merge "Fix leaking animation" into nyc-dev