Merge "Add ephemeral whitelist for SettingsProvider"