Merge "Update the TimeoutAuthenticationMultiSid test" into main