[Bug 15956] "make test" doesn't always leave screen in same video mode as it started in