Merge "Include starting windows in the sysui vis calculation." into klp-dev