Merge "Change contents animations" into nyc-dev