Merge change 5718 into donut

* changes:
  Fix NullPointerException in DrawableContainer.mutate()