Update `run` and `start` to use container wait API Upstream-commit: b3e7e1ff74 Component: cli
b3e7e1ff74