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

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