Fix editor redrawing test failures

Fixes #9169