Merge "Fixes a bug where children could have a colored background"