More careful checking of viewport coverage after updateDisplayInner

Closes #1391