[Bug 46410] using latest git pull, had to apply patch from bug 46291 to fix screen flash