Merge "Propagate DrawableContainer state on mutate, fix ColorDrawable theming" into lmp-mr1-dev