Merge "Merge "Prevent callbacks during DrawableContainer child initialization" into nyc-dev am: 0f1ae5fa am: 4e6cd801" into nyc-mr1-dev-plus-aosp