Merge "Fix for SysUi overrides being applied on non-fullscreen VIS windows." into sc-dev