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

Change-Id: Ia5ff6ff7a08c6cd1d55c8576a7621047a8a4e91d