Merge "[SettingsProvider] fix NPE introduced by ag/26086453" into main