Merge "Behavior compat for child being manipulated outside Animatorset" into oc-dev