Merge "Properly notifies listener when an animation is cancelled. Bug: #2428005."