am 18bbcf7f: Merge "Copy missing state in DrawableContainer" into jb-mr1.1-dev

* commit '18bbcf7f688be41d858b2ac2dd51e7d86371aecb':
  Copy missing state in DrawableContainer