Merge "Fix flaky ExecutorRunnableTest" into main