Merge "Add additional type check for animating along a path"