Merge "Refine the plural strings design in SettingsLib"