Merge "Enable fingerprint nav by default" into nyc-mr1-dev