Merge "Ensure that onAuthenticationFailed() does not finish the auth lifecycle"