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