Merge "Add 2 Settings.Global keys for Settings ExternalProvider."