Merge "Make ConfirmCredentials take user into account when creating intent"