Merge pull request #7989 from jlhawn/graphdriver_differ_refactor

Refactor use of graphdriver.Differ