Merge "Fixed the remove animations for notification children" into nyc-dev