Merge "Fix issues with theming of preloaded ColorStateLists"