Merge "Minor animation cleanup." into nyc-dev