Merge "Refactor CountryDetectorService"