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

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

Change-Id: I32a66f77f1d2aa8052530ed337723960486cc3c6