Merge "Fix window affecting SysUi visibility for once and all" into oc-dev
am: 6cfc8afa7a

Change-Id: I0bf707ab3ad162b1c7b868719d3347f489f51964