Merge remote-tracking branch 'cm/cm-13.0' into cm-13.0-x86

diff --cc src/com/android/settings/SettingsActivity.java
index 96b8d18,9a8076e..49250f5
--- 1/src/com/android/settings/SettingsActivity.java
--- 2/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@@ -281,9 -281,9 +281,10 @@@ public class SettingsActivity extends A
              R.id.display_and_lights_settings,
              R.id.lockscreen_settings,
              R.id.notification_manager,
+             R.id.status_bar_settings,
              R.id.storage_settings,
              R.id.application_settings,
 +            R.id.apps_compatibility_settings,
              R.id.battery_settings,
              R.id.personal_section,
              R.id.location_settings,