Merge "Indicating fingerprint error messages on the bouncer now" into mnc-dr-dev