Merge "Refactor CountryDetectorService" into qt-qpr1-dev