Merge "Handle hybrid themes correctly in Drawable cache" into lmp-preview-dev