Merge "Track userId independently from callback for fingerprint.remove()." into nyc-dev