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

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