Merge "Copy missing state in DrawableContainer" into jb-mr1.1-dev