Merge "No longer need to cancel authentication from ConfirmDeviceCredentialActivity"