Merge "Fix bug where fingerprint events can be delivered to the wrong client" into nyc-dev