Merge changes Icf5b3bc0,I97ae15d8

* changes:
  Magnetic target library!
  Modifies PhysicsAnimator's cancellation methods to support tests.