Merge "Prevent callbacks during DrawableContainer child initialization" into nyc-dev