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

* commit '35a8c2f00e1c3bb2e2cf24260682400d025a49f0':
  Fixed an issue where children would animate strangely when removed

Change-Id: I6d8a18d325bf8885a46fa20756bb3460cb9fa82f