Merge "Clear animation state before dumping old views" into nyc-dev