am 0b6b0fa1: am 0660042a: Merge "Mutate and apply theme if needed before caching themed drawables" into lmp-mr1-dev

* commit '0b6b0fa154b2c02b6ccd90fa083acf422adfcc8c':
  Mutate and apply theme if needed before caching themed drawables