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

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