diff --git a/res/xml/data_usage.xml b/res/xml/data_usage.xml
index 88d7f3202b7..828d0cc9f49 100644
--- a/res/xml/data_usage.xml
+++ b/res/xml/data_usage.xml
@@ -21,7 +21,11 @@
     android:title="@string/data_usage_summary_title">
 
     <com.android.settings.datausage.DataUsageSummaryPreference
-            android:key="status_header"
-            android:selectable="false" />
+        android:key="status_header"
+        android:selectable="false" />
 
+    <com.android.settings.datausage.DataSaverPreference
+        android:key="restrict_background"
+        android:title="@string/data_saver_title"
+        android:fragment="com.android.settings.datausage.DataSaverSummary"/>
 </PreferenceScreen>
diff --git a/res/xml/data_usage_legacy.xml b/res/xml/data_usage_legacy.xml
index 958459c2d16..bbe908a9a91 100644
--- a/res/xml/data_usage_legacy.xml
+++ b/res/xml/data_usage_legacy.xml
@@ -34,7 +34,7 @@
             settings:allowDividerBelow="true" />
 
         <com.android.settings.datausage.DataSaverPreference
-            android:key="restrict_background"
+            android:key="restrict_background_legacy"
             android:title="@string/data_saver_title"
             android:fragment="com.android.settings.datausage.DataSaverSummary" />
 
diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java
index 6d9ef3836c8..cbc414249f8 100644
--- a/src/com/android/settings/datausage/DataUsageSummary.java
+++ b/src/com/android/settings/datausage/DataUsageSummary.java
@@ -261,7 +261,10 @@ public class DataUsageSummary extends DataUsageBaseFragment implements Indexable
     private void updateState() {
         PreferenceScreen screen = getPreferenceScreen();
         for (int i = 1; i < screen.getPreferenceCount(); i++) {
-            ((TemplatePreferenceCategory) screen.getPreference(i)).pushTemplates(services);
+          Preference currentPreference = screen.getPreference(i);
+          if (currentPreference instanceof TemplatePreferenceCategory) {
+            ((TemplatePreferenceCategory) currentPreference).pushTemplates(services);
+          }
         }
     }
 
diff --git a/src/com/android/settings/datausage/DataUsageSummaryLegacy.java b/src/com/android/settings/datausage/DataUsageSummaryLegacy.java
index f46c91e38b3..090e8e45379 100644
--- a/src/com/android/settings/datausage/DataUsageSummaryLegacy.java
+++ b/src/com/android/settings/datausage/DataUsageSummaryLegacy.java
@@ -62,7 +62,7 @@ public class DataUsageSummaryLegacy extends DataUsageBaseFragment implements Ind
 
     static final boolean LOGD = false;
 
-    public static final String KEY_RESTRICT_BACKGROUND = "restrict_background";
+    public static final String KEY_RESTRICT_BACKGROUND = "restrict_background_legacy";
 
     private static final String KEY_STATUS_HEADER = "status_header";
     private static final String KEY_LIMIT_SUMMARY = "limit_summary";
@@ -370,7 +370,7 @@ public class DataUsageSummaryLegacy extends DataUsageBaseFragment implements Ind
                     boolean enabled) {
                 List<SearchIndexableResource> resources = new ArrayList<>();
                 SearchIndexableResource resource = new SearchIndexableResource(context);
-                resource.xmlResId = R.xml.data_usage;
+                resource.xmlResId = R.xml.data_usage_legacy;
                 resources.add(resource);
 
                 resource = new SearchIndexableResource(context);