Merge "StatusBar: add DISABLE2_SYSTEM_ICONS flag"