Merge "Clear child animations before removal" into nyc-support-25.4-dev