Merge "Fixed a bug where the icon of children could be colored" into nyc-dev