Merge "Add styles and attributes in SettingsLib"