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

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