Merge "Add support for SystemUI Window Management"