Refactor daemon container list. Upstream-commit: c8c1c472b21fbe7079f5fccbbda8d9652c7c00d3 Component: engine