Fix flaky TestSaveLoadParents Upstream-commit: 334f73f5b4162ffc3bfb5a07323c83e732bfbfa6 Component: engine