Merge "Don't show repeated fingerprint error messages on bouncer" into nyc-mr1-dev