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

* commit 'bf72e614a038b0aa51d77a93b3d4f76d3a52b892':

Change-Id: Ia4714b12bb8275dd356ef7662efb0ae6b446dbc5