Merge change 20657

* changes:
  Fix possible NPE when mutating a DrawableContainer