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

* commit 'fc5ef04e4d1e3eca1d807d00f12a3f84f8028b8b':
  Fix recent regression in DrawableContainer.