Merge "Exclude unnecessary intents in SystemUI" into lmp-mr1-dev