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

* commit 'd212cfa107948adc986a179deb79aa6b62709b63':
  Fixed a bug where the icon of children could be colored

Change-Id: I69703a99a16700389f057f6277a5da7ca3c5e8f1