Merge "Fix a bug where selected country is reset." into nyc-mr1-dev