Merge "Don't delay the FINGERPRINT_ERROR_CANCELED message" into pi-dev