am f2a382d4: am fb6121e0: Merge "Revert "Ensure calling mutate() on DrawableContainer creates a new state"" into lmp-mr1-dev

* commit 'f2a382d4f7de5336d0c20358bb694e205a38fc38':
  Revert "Ensure calling mutate() on DrawableContainer creates a new state"