SystemUI fixes