IGV-1962 - fix copied from master.  Also, fixed problem with visibility window test in split screen mode.