Fix AnimationHelper and UpdateMarker on self-move.