Merge "Don't show the Fingerprint suggestion if it is disabled." into nyc-mr1-dev