Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev