Merge "Refactor SystemUI and add function in settingslib for service state"