Merge "Flip default value for nav key setting." into nyc-mr1-dev