Merge "Fix flaky test: increase sleep duration" into main