Refactor server to use the daemon as a service Upstream-commit: 3b13e56fd7c6542ae535d83c12939c46bd40e2ad Component: engine