Merge "Fix NPE when country is absent from user's locale"