Fix api servers creation and daemon start order Upstream-commit: b4e894236792e830b6df45f3444ff6800e571ae4 Component: engine