Merge "Remove animation listener while paused." into nyc-dev