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

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