Refactor use of graphdriver.Differ Upstream-commit: 37b3b34afa11b352fb164625f17e76b7d851ee60 Component: engine