Merge "Replace LocaleTracker with CountryDetector"