Merge "Fix color resource names for Material color scheme"