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

* commit '713bebdac508bb8e6fb0866f4cae873806dad459':
  Copy missing state in DrawableContainer