Merge "Make failed ConfirmCredential attempts count towards wipe"