Merge "Add in-app CountryDetector (2/4)"