am 9d383ece: Merge "Fix recent regression in DrawableContainer." into klp-dev

* commit '9d383ece52620b0358bcfae7f2102b64acd1d5cb':
  Fix recent regression in DrawableContainer.