Merge "Always mutate child when added to drawable container" into nyc-dev