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: Ib0677499d5ca95931cc3bc98692bf7b180b0196b