Merge "Propagate location mode properly from SettingsProvider"