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

Change-Id: I5b86792f56490c4684e352d8c7f1b86f15bc14b7