Merge "Fix window affecting SysUi visibility for once and all" into oc-dev