Merge "Fix SystemUI intents"