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

Change-Id: Iac5ed116e1033ab741c123c2c758958ad914c493