SystemUI: Fix merge errors