Merge "Fix Fingerprint confusing personal and work fingerprints when unified" into nyc-dev