Merge "Fixes and updates to LocationSettingsStore"