am 106210a7: Merge "Handle hybrid themes correctly in Drawable cache" into lmp-preview-dev

* commit '106210a703563cfb11c23ab80d8f29b990df7ec5':
  Handle hybrid themes correctly in Drawable cache