Merge "Implement user-scoped geolocation configuration"