Merge "Fixed an issue where children would animate strangely when removed"...
Merge "Fixed an issue where children would animate strangely when removed" into nyc-dev am: 35a8c2f0
am: 46443749
* commit '46443749':
Fixed an issue where children would animate strangely when removed
Change-Id: Icaa65bac6793d7751b2aa491887170ac5a53d094