Merge "Fix assertEventuallyTrue timeout" into main