Merge "increase timeout for waitForEvent to avoid data not come in heavy load" into main