Fixing issue with animations not being cancelled.

Bug: 27533931
Change-Id: I724643ec8a2c6cdaa3cade72ae40abcf9d28bae5
6 files changed