Merge "Fixing issue with animations not being cancelled." into nyc-dev