Merge "CountryDetector: Enable detector class override for automotive" into qt-qpr1-dev