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