Merge "Fixed an issue where children would animate strangely when removed" into nyc-dev