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

* commit '6225b881875e2ae3f84b7fa2e9e090f018f32972':
  Copy missing state in DrawableContainer