Merge "[SettingsProvider] extend font size scale range"