Merge "Use different timeouts based on whether event is expected to occur" into main