Merge "Refactor how location providers are managed"