Merge "SysUI co-ex updates" into sc-dev