Merge "Children should have backgrounds" into nyc-dev