Merge "Using material color in SettingsLib" into main