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