Merge "Restore selected country when rotating screen." into nyc-mr1-dev