Merge "Detect country change at runtime too" into qt-dev