Merge "Clean up drawable theming APIs" into lmp-preview-dev