Fix 4.3 systemui merge derps