Merge "Fix recent regression in DrawableContainer." into klp-dev