Fix inconsistency for pause and unpause Upstream-commit: ba76c9214dbbc5d6276a20136eb3c454a1aa0969 Component: engine
docker build