Fix race between dispatchers.run and toDisk Upstream-commit: b0cff06c9743f1f4edeea38c13a8b657eef446e4 Component: engine