Merge "[SettingsProvider] fix font size scale validator"