Merge "Remove work fingerprints when primary profile lock is removed" into nyc-dev