Merge \\"Flip default value for nav key setting.\\" into nyc-mr1-dev am: 742047f565
am: a513e0e046

Change-Id: I2f95a89e47a7176678bc2eb563ff7cdf4a48ff68