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: 152de8e3
* commit '152de8e3':
Change-Id: Ida40d13f18e431650448f131ca89324429543546