am c838b677: Merge "Cancel animation when target changes." into lmp-mr1-dev

* commit 'c838b677749e0c20fc201b0418864be3835711b8':
  Cancel animation when target changes.