Merge "Don't set same country code on supplicant again and again" into klp-dev