diff --git a/res/drawable/line.xml b/res/drawable/line.xml
new file mode 100644
index 0000000..786ed1c
--- /dev/null
+++ b/res/drawable/line.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+
+    <solid android:color="@android:color/transparent" />
+
+    <padding
+        android:top="10dp"
+        android:left="10dp"
+        android:right="10dp"
+        android:bottom="10dp"/>
+</shape>
\ No newline at end of file
diff --git a/res/drawable/line_drawable.xml b/res/drawable/line_drawable.xml
new file mode 100644
index 0000000..a524c61
--- /dev/null
+++ b/res/drawable/line_drawable.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/line" />
+
+    <item
+        android:drawable="@drawable/line" />
+</selector>
\ No newline at end of file
diff --git a/res/drawable/thumb.xml b/res/drawable/thumb.xml
new file mode 100644
index 0000000..42fbd8c
--- /dev/null
+++ b/res/drawable/thumb.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+
+    <corners
+        android:topLeftRadius="8dp"
+        android:topRightRadius="8dp"
+        android:bottomLeftRadius="8dp"
+        android:bottomRightRadius="8dp"/>
+
+    <padding
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp" />
+
+    <solid android:color="?android:attr/colorControlNormal" />
+
+</shape>
\ No newline at end of file
diff --git a/res/drawable/thumb_drawable.xml b/res/drawable/thumb_drawable.xml
new file mode 100644
index 0000000..b99536d
--- /dev/null
+++ b/res/drawable/thumb_drawable.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/thumb"/>
+
+    <item
+        android:drawable="@drawable/thumb"/>
+</selector>
\ No newline at end of file
diff --git a/res/layout/manage_applications_apps.xml b/res/layout/manage_applications_apps.xml
index e4ec871..d362528 100644
--- a/res/layout/manage_applications_apps.xml
+++ b/res/layout/manage_applications_apps.xml
@@ -14,44 +14,53 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <FrameLayout
-              android:layout_width="match_parent"
-              android:layout_height="0dp"
-              android:layout_weight="1">
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1">
 
-        <LinearLayout android:id="@+id/list_container"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:visibility="gone">
+        <LinearLayout
+            android:id="@+id/list_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:visibility="gone">
 
             <FrameLayout
                 android:id="@+id/pinned_header"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
 
-            <FrameLayout android:layout_width="match_parent"
-                    android:layout_height="0px"
-                    android:layout_weight="1">
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="0px"
+                android:layout_weight="1">
 
-                <ListView android:id="@android:id/list"
-                    android:drawSelectorOnTop="false"
+                <android.support.v7.widget.RecyclerView
+                    android:id="@+id/apps_list"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:clipToPadding="false"
-                    android:scrollbarStyle="@integer/preference_scrollbar_style" />
+                    settings:fastScrollEnabled="true"
+                    settings:fastScrollHorizontalThumbDrawable="@drawable/thumb_drawable"
+                    settings:fastScrollHorizontalTrackDrawable="@drawable/line_drawable"
+                    settings:fastScrollVerticalThumbDrawable="@drawable/thumb_drawable"
+                    settings:fastScrollVerticalTrackDrawable="@drawable/line_drawable"/>
 
-                <TextView android:id="@android:id/empty"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:gravity="center"
-                        android:text="@string/no_applications"
-                        android:textAppearance="?android:attr/textAppearanceLarge" />
+                <TextView
+                    android:id="@android:id/empty"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:text="@string/no_applications"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    android:visibility="invisible" />
 
             </FrameLayout>
 
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index ac54406..937c9fc 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -2842,6 +2842,7 @@
       <item quantity="other">‏عرض %d عنصر مخفي</item>
       <item quantity="one">‏عرض %d عنصر مخفي</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"تصغير"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"الشبكة والإنترنت"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"الجوّال"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"استخدام البيانات"</string>
@@ -2948,8 +2949,14 @@
       <item quantity="other">تم تشغيل <xliff:g id="ON_COUNT">%d</xliff:g> قاعدة تلقائية</item>
       <item quantity="one">تم تشغيل قاعدة تلقائية واحدة</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"تفضيلات وضع \"عدم الإزعاج\""</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"السماح بالأولويّات فقط"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"الرجاء عدم الإزعاج"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"السُلوك"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"السماح بالأصوات والاهتزازات من"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"بلا صوت"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"بلا صوت (كتم الصوت تمامًا)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"بلا صوت غير <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"القواعد التلقائية"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"تعيين قواعد عدم الإزعاج"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"تقييد الأصوات والاهتزازات في أوقات معينة"</string>
@@ -3141,13 +3148,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"من جهات الاتصال المميزة بنجمة فقط"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"من لا أحد"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"التنبيهات"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"المنبهات لها أولوية دائمًا وتصدِر تنبيهًا صوتيًا"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"التذكيرات"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"الأحداث"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"جميع المتصلين"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"المتصلون المحدّدون"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"المتصلون المتكرّرون"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"السماح فقط في حال اتصال الشخص نفسه للمرة الثانية في غضون <xliff:g id="MINUTES">%d</xliff:g> من الدقائق"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"في حال اتصال الشخص نفسه للمرة الثانية في غضون <xliff:g id="MINUTES">%d</xliff:g> دقيقة"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"تشغيل تلقائي"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"مطلقًا"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"كل ليلة"</string>
@@ -3464,8 +3472,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"إمكانية تعديل إعدادات النظام"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"تعديل إعدادات النظام"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"إذن تعديل التطبيق لإعدادات النظام"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"السماح بتعديل إعدادات النظام"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"يتيح هذا الإذن للتطبيق إمكانية تعديل إعدادات النظام."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"نعم"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"لا"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 9c58d5a..2ce4c2a 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -2764,6 +2764,7 @@
       <item quantity="few">Prikaži %d skrivene stavke</item>
       <item quantity="other">Prikaži %d skrivenih stavki</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Skupi"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Mreža i internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobilna mreža"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"potrošnja podataka"</string>
@@ -2867,8 +2868,14 @@
       <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> automatska pravila su uključena</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> automatskih pravila je uključeno</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Podešavanja za Ne uznemiravaj"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Dozvoljeni su samo prioriteti"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Ne uznemiravaj"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Ponašanje"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Dozvoli zvuke i vibracije od:"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Bez zvuka"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Bez zvuka (potpuna tišina)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Bez zvuka osim za: <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatska pravila"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Podesite pravila za režim „Ne uznemiravaj“"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Ograniči zvukove i vibracije u određenim intervalima"</string>
@@ -3048,13 +3055,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Samo od kontakata sa zvezdicom"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ni od koga"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmi"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarmi su uvek prioritet i emituje se zvuk"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Podsetnici"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Događaji"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Svi pozivaoci"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Izabrani pozivaoci"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Ponovni pozivaoci"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Ako ista osoba pozove po drugi put u roku od <xliff:g id="MINUTES">%d</xliff:g> min, dozvoli poziv"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Ako ista osoba pozove po drugi put u periodu od <xliff:g id="MINUTES">%d</xliff:g> min"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automatski uključi"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nikad"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Svake večeri"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 8674f69..7becc9f 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -2791,6 +2791,7 @@
       <item quantity="many">Паказаць %d схаваных элементаў</item>
       <item quantity="other">Паказаць %d схаванага элемента</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Згарнуць"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Сетка і інтэрнэт"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"мабільная сетка"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"выкарыстанне трафіка"</string>
@@ -2895,8 +2896,14 @@
       <item quantity="many">Уключаны <xliff:g id="ON_COUNT">%d</xliff:g> аўтаматычных правіл</item>
       <item quantity="other">Уключаны <xliff:g id="ON_COUNT">%d</xliff:g> аўтаматычнага правіла</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Параметры рэжыму \"Не турбаваць\""</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Дазволены толькі прыярытэтныя"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Не турбаваць"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Паводзіны"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Дазволіць гукі і вібрацыю ад:"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Без гуку"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Без гуку (поўная цішыня)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Без гуку. Выключэнні: <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Аўтаматычныя правілы"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Правілы рэжыму \"Не турбаваць\""</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Абмяжоўваць гукі і вібрацыю ў пэўныя часы"</string>
@@ -3080,13 +3087,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Толькі ад кантактаў, пазначаных зоркай"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ні ад каго"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Будзільнікі"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Будзільнік заўсёды важны і падае гукавы сігнал"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Напаміны"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Падзеі"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Усе абаненты"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Выбраныя выклікі"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Паўторныя выклікі"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Калі адзін і той жа чалавек тэлефануе вам другі раз за <xliff:g id="MINUTES">%d</xliff:g> хвілін, дазволіць гэты выклік"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Калі адзін і той жа чалавек тэлефануе другі раз за наступную колькасць хвілін: <xliff:g id="MINUTES">%d</xliff:g>"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Уключыць аўтаматычна"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Ніколі"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Кожную ноч"</string>
@@ -3386,8 +3394,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Якія могуць змяняць сістэмныя налады"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Змена сістэмных налад"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Дазвол змены сістэмных налад для дадатку"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Дазволіць змяняць налады сістэмы"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Гэта дазваляе дадатку змяняць сістэмныя налады."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Так"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Не"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 2b38db3..37181e2 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="other">Показване на %d скрити елемента</item>
       <item quantity="one">Показване на %d скрит елемент</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Свиване"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Мрежа и интернет"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"мобилна мрежа"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"пренос на данни"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> автоматични правила са включени</item>
       <item quantity="one">1 автоматично правило е включено</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Режим „Не безпокойте“"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Само приоритетни прекъсвания"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Не безпокойте"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Поведение"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Разреш. на звуци и вибрир. от"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Без звук"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Без звук (пълна тишина)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Без звук освен за <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Автомат. правила"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Правила за „Не безпокойте“"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Без звуци и вибриране в дадени моменти"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Само от контакти със звезда"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Никакви"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Будилници"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Будилниците са винаги с приоритет и издават звук"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Напомняния"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Събития"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Всички обаждащи се"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Избрани обаждащи се"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Повторно обаждащи се"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Ако един и същ човек се обади втори път в рамките на период от <xliff:g id="MINUTES">%d</xliff:g> мин, това да се разреши"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Ако един и същ човек се обади втори път в рамките на период от <xliff:g id="MINUTES">%d</xliff:g> мин"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Авт. включване"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Никога"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Всяка вечер"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 13114f5..f056cd2 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -2636,9 +2636,9 @@
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"ডিফল্ট ব্যবহার করুন"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"সবসময়"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"অন্য কোনো অর্থপ্রদান অ্যাপ্লিকেশান খুলে থাকার সময় ব্যতিত"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"ট্যাপ করে অর্থপ্রদান করুন টার্মিন্যালে, এর মাধ্যমে অর্থ প্রদান করুন:"</string>
-    <string name="nfc_how_it_works_title" msgid="1984068457698797207">"টার্মিনালে অর্থপ্রদানের পদ্ধতি"</string>
-    <string name="nfc_how_it_works_content" msgid="4749007806393224934">"একটি অর্থপ্রদানের অ্যাপ্লিকেশান সেট আপ করুন৷ তারপরে যোগাযোগহীন চিহ্ন সহ কোনো টার্মিনালের উপর শুধু আপনার ফোনের পিছনের দিকটি ধরুন৷"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"ট্যাপ করে অর্থপ্রদান করুন টার্মিন্যালে, এর মাধ্যমে পেমেন্ট করুন:"</string>
+    <string name="nfc_how_it_works_title" msgid="1984068457698797207">"টার্মিনালে পেমেন্টের পদ্ধতি"</string>
+    <string name="nfc_how_it_works_content" msgid="4749007806393224934">"একটি পেমেন্টের অ্যাপ্লিকেশান সেট আপ করুন৷ তারপরে যোগাযোগহীন চিহ্ন সহ কোনো টার্মিনালের উপর শুধু আপনার ফোনের পিছনের দিকটি ধরুন৷"</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"বুঝেছি"</string>
     <string name="nfc_more_title" msgid="815910943655133280">"আরো..."</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"আপনার পছন্দ হিসেবে সেট করুন?"</string>
@@ -2738,6 +2738,7 @@
       <item quantity="one">%dটি লুকানো আইটেম দেখান</item>
       <item quantity="other">%dটি লুকানো আইটেম দেখান</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"সঙ্কুচিত করুন"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"নেটওয়ার্ক ও ইন্টারনেট"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"মোবাইল"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ডেটার ব্যবহার"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g>টি স্বয়ংক্রিয় নিয়ম চালু করা হয়েছে</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g>টি স্বয়ংক্রিয় নিয়ম চালু করা হয়েছে</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"\'বিরক্ত করবেন না\' বিকল্পগুলি"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"অগ্রাধিকার অনুমতিগুলি"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"বিরক্ত করবেন না"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"আচরণ"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"এগুলির সাউন্ড ও ভাইব্রেশন হবে"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"কোনও সাউন্ড নয়"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"কোনও সাউন্ড নয় (সম্পূর্ণ নীরব)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g> ছাড়া কোনও সাউন্ড নয়"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"স্বয়ংক্রিয় নিয়মগুলি"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"\'বিরক্ত করবেন না\' সেট আপ করুন"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"নির্দিষ্ট সময়ের ক্ষেত্রে শব্দ এবং কম্পন সীমিত করুন"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"শুধুমাত্র তারকাচিহ্নিত পরিচিতিদের থেকে"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"কোনো কিছুই নয়"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"অ্যালার্মগুলি"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"অ্যালার্ম সর্বদা অগ্রাধিকার পায় এবং সেগুলি থেকে আওয়াজ হয়"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"অনুস্মারকগুলি"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ইভেন্টগুলি"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"সমস্ত কলার"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"নির্বাচিত কলারগুলি"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"কলারগুলির পুনরাবৃত্তি করুন"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"যদি একই ব্যক্তি <xliff:g id="MINUTES">%d</xliff:g> মিনিটের মধ্যে দ্বিতীয়বার কল করেন, তবে এটি অনুমোদন করুন"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"একই ব্যক্তি দ্বিতীয়বার কল করলে <xliff:g id="MINUTES">%d</xliff:g>"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"স্বয়ংক্রিয়ভাবে চালু"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"কখনও নয়"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"প্রতিদিন রাতে"</string>
@@ -3304,8 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"সিস্টেম সেটিংস সংশোধন করতে পারে"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"সিস্টেম সেটিংস সংশোধন করুন"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"অ্যাপ্লিকেশানটি সিস্টেম সেটিংসের অনুমতি সংশোধন করে"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"সিস্টেম সেটিংস পরিবর্তনের অনুমতি দিন"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"এই অনুমতিটি কোনো অ্যাপ্লিকেশানকে সিস্টেম সেটিংস সংশোধন করার অনুমতি দেয়৷"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"হ্যাঁ"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"না"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 1549989..8e1bf17 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -2764,6 +2764,7 @@
       <item quantity="few">Prikaži %d skrivene stavke</item>
       <item quantity="other">Prikaži %d skrivenih stavki</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Suzite"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Mreža i internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobilna mreža"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"prijenos podataka"</string>
@@ -2867,8 +2868,14 @@
       <item quantity="few">Uključena su <xliff:g id="ON_COUNT">%d</xliff:g> automatska pravila</item>
       <item quantity="other">Uključeno je <xliff:g id="ON_COUNT">%d</xliff:g> automatskih pravila</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Postavke funkcije Ne ometaj"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioritetni način dopušta samo sljedeće"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Ne ometaj"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Ponašanje"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Omogući zvuke i vibracije od"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Bez zvuka"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Bez zvuka (Potpuno utišano)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Bez zvuka osim <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatska pravila"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Postavite pravila za funkciju Ne ometaj"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Ograničite zvuk i vibracije u određenim vremenskim periodima"</string>
@@ -3048,13 +3055,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Samo od kontakata označenih zvjezdicom"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ništa"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmi"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarmi uvijek imaju prioritet i oglašavaju se zvukom"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Podsjetnici"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Događaji"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Svi pozivi"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Odabrani pozivaoci"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Ponovni pozivaoci"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Dopuštanje poziva ako ista osoba zove drugi put u roku od <xliff:g id="MINUTES">%d</xliff:g> min."</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Ukoliko ista osoba pozove ponovo u roku od <xliff:g id="MINUTES">%d</xliff:g> min"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automatski upaliti"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nikad"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Svaku noć"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 87cb7ed..b19deba 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="other">Mostra %d elements amagats</item>
       <item quantity="one">Mostra %d element amagat</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Replega"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Xarxa i Internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"xarxa mòbil"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ús de dades"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> regles automàtiques activades</item>
       <item quantity="one">1 regla automàtica activada</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Preferències per a No molestis"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioritat només permet"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"No molestis"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Comportament"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Permet sons i vibracions de:"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Sense so"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Sense so (Silenci total)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Sense so excepte <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Regles automàtiques"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Defineix regles de No molestis"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limita sons i vibracions en hores concretes"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Només dels contactes destacats"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Cap"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmes"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Les alarmes sempre tenen prioritat i sonen"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Recordatoris"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Esdeveniments"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Totes les trucades"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Contactes seleccionats"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Trucades repetides"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Si una mateixa persona truca dues vegades en un període de <xliff:g id="MINUTES">%d</xliff:g> minuts, permet la segona trucada"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Si una mateixa persona truca dues vegades en menys de <xliff:g id="MINUTES">%d</xliff:g> minuts"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Activa automàticam."</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Mai"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Cada nit"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 1ef2a89..d408663 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -2790,6 +2790,7 @@
       <item quantity="other">Zobrazit %d skrytých položek</item>
       <item quantity="one">Zobrazit %d skrytou položku</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Sbalit"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Síť a internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobilní síť"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"využití dat"</string>
@@ -2894,8 +2895,14 @@
       <item quantity="other">Je zapnuto <xliff:g id="ON_COUNT">%d</xliff:g> automatických pravidel</item>
       <item quantity="one">Je zapnuto 1 automatické pravidlo</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Nastavení režimu Nerušit"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Pouze prioritní"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Nerušit"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Chování"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Povolit zvuky a vibrace pro"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Žádné zvuky"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Žádné zvuky (úplné ticho)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Žádné zvuky. Výjimka: <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatická pravidla"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Nast. pravidel režimu Nerušit"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Omezit zvuky a vibrace v určitou dobu"</string>
@@ -3079,13 +3086,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Pouze od oblíbených kontaktů"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Žádné"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Budíky"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Budíky jsou vždy prioritní a budou slyšet"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Připomenutí"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Události"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Všichni volající"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Vybraní volající"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Volající, kteří volají opakovaně"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Pokud stejná osoba zavolá podruhé během <xliff:g id="MINUTES">%d</xliff:g> min, bude povolena"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Pokud stejná osoba zavolá podruhé během <xliff:g id="MINUTES">%d</xliff:g> min"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automaticky zapnout"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nikdy"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Každou noc"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index d1fa223..d57cae7 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -1072,7 +1072,7 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Indstillinger"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk lysstyrke"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Løft enheden for at vække den"</string>
-    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Inaktiv skærm"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Aktiv låseskærm"</string>
     <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Altid aktiveret/øget batteriforbrug"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nye underretninger"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Hvornår skal den vises"</string>
@@ -2738,6 +2738,7 @@
       <item quantity="one">Vis %d skjult element</item>
       <item quantity="other">Vis %d skjulte elementer</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Skjul"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Netværk og internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobilnetværk"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"dataforbrug"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> automatisk regel er slået til</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> automatiske regler er slået til</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Præferencer for Forstyr ikke"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Kun prioritet tillader"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Forstyr ikke"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Adfærd"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Tillad lyde og vibrationer fra"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Ingen lyd"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Ingen lyd (total stilhed)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Ingen lyd undtagen fra <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatiske regler"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Angiv regler for Forstyr ikke"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Begræns lyde og vibrationer på bestemte tidspunkter"</string>
@@ -2912,7 +2919,7 @@
     </plurals>
     <string name="no_notification_listeners" msgid="3487091564454192821">"Ingen installerede apps har anmodet om adgang til underretninger."</string>
     <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"Tillad adgang til underretninger for <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> kan læse alle underretninger, herunder personlige oplysninger såsom navne på kontaktpersoner og teksten i de meddelelser, du modtager. Underretningslytteren kan også afvise underretninger eller udløse handlingsknapper, de indeholder. \n\nDette gør det også muligt for appen at slå Forstyr ikke til eller fra og ændre relaterede indstillinger."</string>
+    <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> kan læse alle underretninger, herunder personlige oplysninger såsom navne på kontaktpersoner og teksten i de meddelelser, du modtager. Underretningslytteren kan også afvise underretninger eller aktivere handlingsknapper, de indeholder. \n\nDette gør det også muligt for appen at slå Forstyr ikke til eller fra og ændre relaterede indstillinger."</string>
     <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"Hvis du slår adgang til underretninger fra for <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>, slås adgangen til Forstyr ikke muligvis også fra."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"Slå fra"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"Annuller"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Kun fra stjernemarkerede kontaktpersoner"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ingen"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmer"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarmer prioriteres altid og afgiver lyde"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Påmindelser"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Begivenheder"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Alle opkaldere"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Udvalgte opkald"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Gentagne opkald"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Tillad, hvis den samme person ringer to gange inden for <xliff:g id="MINUTES">%d</xliff:g> minutter"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Hvis den samme person ringer for anden gang inden for <xliff:g id="MINUTES">%d</xliff:g> minutter"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Aktivér automatisk"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Aldrig"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Hver nat"</string>
@@ -3304,8 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Apps, som kan ændre systemindstillinger"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Rediger systemindstillinger"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Apptilladelse til at ændre systemindstillinger"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Tillad ændring af systemindstillinger"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Denne tilladelse giver en app lov til at ændre systemindstillinger."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nej"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index aa9a622..9cf6818 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="other">%d ausgeblendete Elemente anzeigen</item>
       <item quantity="one">%d ausgeblendetes Element anzeigen</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Minimieren"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Netzwerk &amp; Internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"Mobilfunknetz"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"Datennutzung"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> automatische Regeln aktiviert</item>
       <item quantity="one">1 automatische Regel aktiviert</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Einstellungen für \"Nicht stören\""</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Nur wichtige Unterbrechungen zulassen"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Bitte nicht stören"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Verhalten"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Töne &amp; Vibration zulassen von"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Kein Ton"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Kein Ton (Lautlos)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Kein Ton außer durch <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatische Regeln"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"\"Nicht stören\"-Regeln einrichten"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Töne &amp; Vibrationen zu bestimmten Zeiten einschränken"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Nur von markierten Kontakten"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Keine"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Wecker"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarme haben Priorität und ein Ton wird ausgegeben"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Erinnerungen"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Termine"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Alle Anrufer"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"ausgewählte Anrufer"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Wiederholte Anrufer"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Zulassen, falls dieselbe Person innerhalb von <xliff:g id="MINUTES">%d</xliff:g> Minuten erneut anruft"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Wenn dieselbe Person innerhalb von <xliff:g id="MINUTES">%d</xliff:g> Minuten noch einmal anruft"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Autom. aktivieren"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nie"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Jede Nacht"</string>
@@ -3304,8 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Kann Systemeinstellungen ändern"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Systemeinstellungen ändern"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Änderungsberechtigung für Systemeinstellungen"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Änderung von Systemeinstellungen zulassen"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Diese Berechtigung ermöglicht einer App das Ändern von Systemeinstellungen."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nein"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 402716f..7603968 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="other">Εμφάνιση %d κρυφών στοιχείων</item>
       <item quantity="one">Εμφάνιση %d κρυφού στοιχείου</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Σύμπτυξη"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Δίκτυο και διαδίκτυο"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"δίκτυο κινητής τηλεφωνίας"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"χρήση δεδομένων"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="other">Ενεργοποιήθηκαν <xliff:g id="ON_COUNT">%d</xliff:g> αυτόματοι κανόνες</item>
       <item quantity="one">Ενεργοποιήθηκε 1 αυτόματος κανόνας</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Προτ/σεις \"Μην ενοχλείτε\""</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Μόνο προτεραιότητας"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Μην ενοχλείτε"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Συμπεριφορά"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Να επιτρέπονται ήχοι και δονήσεις από"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Χωρίς ήχο"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Χωρίς ήχο (πλήρης σίγαση)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Χωρίς ήχο, εκτός από <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Αυτόματοι κανόνες"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Ρύθμ. κανόνων \"Μην ενοχλείτε\""</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Περιορίστε τους ήχους και τις δονήσεις για συγκεκριμένες ώρες"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Μόνο από τις επαφές με αστέρι"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Κανένα"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Ξυπνητήρια"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Τα ξυπνητήρια έχουν πάντα προτεραιότητα και ήχο"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Υπενθυμίσεις"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Συμβάντα"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Όλοι οι καλούντες"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Επιλεγμένοι καλούντες"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Καλούντες κατ\' επανάληψη"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Εάν το ίδιο άτομο καλέσει δεύτερη φορά εντός διαστήματος <xliff:g id="MINUTES">%d</xliff:g> λεπτών, να επιτρέπεται"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Εάν το ίδιο άτομο καλέσει δεύτερη φορά εντός διαστήματος <xliff:g id="MINUTES">%d</xliff:g> λεπτών"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Αυτόματη ενεργοπ."</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Ποτέ"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Κάθε βράδυ"</string>
@@ -3304,8 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Δυνατότητα τροποποίησης ρυθμίσεων συστήματος"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Τροποποίηση ρυθμ. συστήματος"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Άδεια εφαρμογής τροποποίησης ρυθμίσεων συστήματος"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Να επιτρέπεται η τροποπ. των ρυθμ. συστήματος"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Αυτή η άδεια επιτρέπει σε μια εφαρμογή την τροποποίηση των ρυθμίσεων συστήματος."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ναι"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Όχι"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index abec520..eecdcc1 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="other">Mostrar %d elementos ocultos</item>
       <item quantity="one">Mostrar %d elemento oculto</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Ocultar"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Red e Internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"móvil"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"uso de datos"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> reglas automáticas activadas</item>
       <item quantity="one">1 regla automática activada</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Preferencias de No molestar"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioridad solo permite"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"No molestar"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Comportamiento"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Permitir sonidos/vibraciones de"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Sin sonido"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Sin sonido (silencio total)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Sin sonido excepto <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Reglas automáticas"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Definir reglas de No molestar"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limitar sonido y vibración en algunos momentos"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Solo de contactos destacados"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ninguno"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmas"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Las alarmas son prioritarias y emiten sonido"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Recordatorios"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Eventos"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Todas las llamadas"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Contactos seleccionados"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Llamadas repetidas"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Permitir llamadas que procedan de la misma persona si no han pasado más de <xliff:g id="MINUTES">%d</xliff:g> minutos desde su primera llamada"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Permitir llamadas que procedan de la misma persona si no han pasado más de <xliff:g id="MINUTES">%d</xliff:g> minutos desde su primera llamada"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Activar automáticamente"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nunca"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Todas las noches"</string>
@@ -3304,8 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Puede modificar los ajustes del sistema"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Modificar ajustes del sistema"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Permiso de aplicación para modificar ajustes sistema"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Permitir que se modifiquen ajustes del sistema"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Cuando se concede este permiso, la aplicación puede modificar los ajustes del sistema."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Sí"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 8072f4e..7a364c9 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="other">Kuva %d peidetud üksust</item>
       <item quantity="one">Kuva %d peidetud üksus</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Ahenda"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Võrk ja Internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobiil"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"andmekasutus"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> automaatset reeglit on sisse lülitatud</item>
       <item quantity="one">1 automaatne reegel on sisse lülitatud</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Režiimi Mitte segada eelistused"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioriteetne lubab ainult"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Mitte segada"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Käitumine"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Luba heli ja vibreerimine:"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Heli puudub"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Heli puudub (täielik vaikus)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Heli puudub, v.a <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automaatsed reeglid"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Režiimi Mitte segada reeglid"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Helid ja värinad on piiratud"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Ainult tärniga tähistatud kontaktidelt"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Mitte kelleltki"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Äratused"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Äratused on alati prioriteetsed ja esitavad heli"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Meeldetuletused"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Sündmused"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Kõik helistajad"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Valitud helistajad"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Korduvad helistajad"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Kui sama inimene helistab <xliff:g id="MINUTES">%d</xliff:g> minuti jooksul teist korda, siis see lubatakse"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Kui sama inimene helistab teile <xliff:g id="MINUTES">%d</xliff:g> minuti jooksul teist korda"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Autom. sisselülitus"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Mitte kunagi"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Igal õhtul"</string>
@@ -3304,8 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Saab muuta süsteemiseadeid"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Süsteemiseadete muutmine"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Rakendustel süsteemiseadete muutmise lubamine"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Luba süsteemiseadete muutmine"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Luba võimaldab rakendusel muuta süsteemiseadeid."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Jah"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ei"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 71ce20e..7dbba91 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -2255,7 +2255,7 @@
     <string name="select_device_admin_msg" msgid="7347389359013278077">"Gailua administratzeko aplikazioak"</string>
     <string name="no_device_admins" msgid="4846602835339095768">"Ez dago gailua administratzeko aplikaziorik"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Pertsonala"</string>
-    <string name="managed_device_admin_title" msgid="7853955652864478435">"Lantokia"</string>
+    <string name="managed_device_admin_title" msgid="7853955652864478435">"Lanekoak"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Ez dago agente fidagarririk erabilgarri"</string>
     <string name="add_device_admin_msg" msgid="1501847129819382149">"Gailua administratzeko aplikazioa aktibatu?"</string>
     <string name="add_device_admin" msgid="4192055385312215731">"Aktibatu gailua administratzeko aplikazioa"</string>
@@ -2738,6 +2738,7 @@
       <item quantity="other">Erakutsi %d elementu ezkutu</item>
       <item quantity="one">Erakutsi %d elementu ezkutu</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Tolestu"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Sareak eta Internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mugikorra"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"datuen erabilera"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> arau automatiko aktibatuta</item>
       <item quantity="one">1 arau automatiko aktibatuta</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"\"Ez molestatu\" moduaren hobespenak"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Lehentasunezkoak soilik"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Ez molestatu"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Jokabidea"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Baimendu soinu eta dardara hauek:"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Ez egin soinurik"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Ez egin soinurik (isiltasun osoa)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Ez egin soinurik. Salbuespena: <xliff:g id="CATEGORIES">%1$s</xliff:g>."</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Arau automatikoak"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Ezarri \"Ez molestatu\" arauak"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Mugatu soinuak eta dardarak ordu jakinetara"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Kontaktu izardunenak soilik"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Bat ere ez"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmak"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarmek soinua egiten dute lehentasuna dutelako"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Abisuak"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Gertaerak"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Deitzaile guztiak"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Hautatutako deitzaileak"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Berriro deitu dutenak"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Pertsona berak berriro deitzen badu <xliff:g id="MINUTES">%d</xliff:g> minutuko epean, onartu deia"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"<xliff:g id="MINUTES">%d</xliff:g> minutuko epean pertsona berak berriz deitzen badu"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Aktibatu automatikoki"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Inoiz ez"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Gauero"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 0c8c979..9497ec6 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="other">Näytä %d piilotettua kohdetta</item>
       <item quantity="one">Näytä %d piilotettu kohde</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Tiivistä"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Verkko ja internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobiili"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"datan käyttö"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> automaattista sääntöä käytössä</item>
       <item quantity="one">1 automaattinen sääntö käytössä</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Älä häiritse ‑tilan asetukset"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Sallittavat tärkeät ilmoitukset"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Älä häiritse"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Käyttäytyminen"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Salli äänet &amp; värinä kohteesta"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Ei ääntä"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Ei ääntä (Täysi hiljaisuus)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Ei ääntä, paitsi <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automaattiset säännöt"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Määritä Älä häiritse ‑säännöt"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Rajoita ääniä ja värinää tiettyinä aikoina."</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Vain tähdellä merkityiltä kontakteilta"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ei keneltäkään"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Herätykset"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Herätykset ovat aina tärkeitä ja toistavat äänimerkin."</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Muistutukset"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Tapahtumat"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Kaikki soittajat"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Valitut soittajat"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Toistuvat soitot"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Salli, jos sama henkilö soittaa uudelleen <xliff:g id="MINUTES">%d</xliff:g> minuutin kuluessa."</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Jos sama henkilö soittaa uudelleen <xliff:g id="MINUTES">%d</xliff:g> minuutin kuluessa"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Ota autom. käyttöön"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Ei koskaan"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Joka yö"</string>
@@ -3304,8 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Voi muokata järjestelmäasetuksia"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Muokkaa järjestelmäasetuksia"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Sovelluksen järjestelmäasetusten muokkausoikeus"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Salli järjestelmäasetusten muokkaaminen"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Tämä käyttöoikeus sallii sovelluksen muokata järjestelmäasetuksia."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Kyllä"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ei"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 79d0a88..ab0c4ff 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="one">Afficher %d élément masqué</item>
       <item quantity="other">Afficher %d éléments masqués</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Réduire"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Réseau et Internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"cellulaire"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"utilisation de données"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> règle automatique activée</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> règles automatiques activées</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Préférences Ne pas déranger"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioritaires seulement"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Ne pas déranger"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Comportement"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Autoriser sons et vibrations de"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Aucun son"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Aucun son (silence total)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Aucun son sauf <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Règles automatiques"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Créer règles Ne pas déranger"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limiter sons et vibrations à certains moments"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Des contacts favoris seulement"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Aucun"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmes"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Les alarmes sont toujours une priorité et émettent un son"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Rappels"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Événements"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Tous les appelants"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Appelants sélectionnés"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Appelants fréquents"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Si la même personne appelle deux fois en <xliff:g id="MINUTES">%d</xliff:g> minute(s), autoriser le deuxième appel"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Si la même personne appelle deux fois en <xliff:g id="MINUTES">%d</xliff:g> minute(s), autoriser le deuxième appel"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Activation auto"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Jamais"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Tous les soirs"</string>
@@ -3304,8 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Peut modifier les paramètres du système"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Modifier paramètres système"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Autorisation de modifier les paramètres système"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Autoriser la modification des paramètres du système"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Cette autorisation permet à une application de modifier les paramètres du système."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Oui"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Non"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 4370ad0..1bbcb65 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="one">Afficher %d élément masqué</item>
       <item quantity="other">Afficher %d éléments masqués</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Réduire"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Réseau et Internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobile"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"consommation des données"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> règle automatique activée</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> règles automatiques activées</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Préférences \"Ne pas déranger\""</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioritaires uniquement"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Ne pas déranger"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Comportement"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Autoriser sons et vibrations de"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Aucun son"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Aucun son (silence total)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Aucun son, sauf <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Règles automatiques"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Définir règles Ne pas déranger"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limiter les sons et le vibreur"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Des contacts favoris uniquement"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Aucun"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmes"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarmes toujours prioritaires et sonores"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Rappels"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Événements"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Tous les appelants"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Appelants sélectionnés"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Appels répétés"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Autoriser le second appel si la même personne appelle deux fois en <xliff:g id="MINUTES">%d</xliff:g> minute(s)"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Si la même personne appelle deux fois en <xliff:g id="MINUTES">%d</xliff:g> minute(s)"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Activation auto"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Jamais"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Tous les soirs"</string>
@@ -3304,8 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Peut modifier les paramètres système"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Modifier paramètres système"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Autorisation modifier paramètres système par applis"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Autoriser modification des paramètres système"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Cette autorisation permet à une application de modifier les paramètres système."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Oui"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Non"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index fb862bc..a1cfc48 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="other">Mostrar %d elementos ocultos</item>
       <item quantity="one">Mostrar %d elemento oculto</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Contraer"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Rede e Internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"rede de telefonía móbil"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"uso de datos"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> normas automáticas activadas</item>
       <item quantity="one">1 norma automática activada</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Preferencias de Non molestar"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioridade: só se permite"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Non molestar"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Comportamento"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Permitir sons e vibracións de"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Ningún son"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Ningún son (silencio total)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Ningún son agás <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Normas automáticas"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Definir normas de Non molestar"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limita sons e vibracións en certos momentos"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Só dos contactos marcados con estrela"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ningunha"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmas"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"As alarmas sempre son prioritarias e emiten son"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Recordatorios"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Eventos"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Todos os emisores de chamadas"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Emisores da chamada seleccionados"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Repetir emisores da chamada"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Se a mesma persoa chama por segunda vez nun período de <xliff:g id="MINUTES">%d</xliff:g> minutos, permitir"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Se a mesma persoa chama por segunda vez nun período de <xliff:g id="MINUTES">%d</xliff:g> minutos"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Activar automaticam."</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nunca"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Todas as noites"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 99a8511..55df6fa 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="one">%d છુપાયેલ આઇટમ બતાવો</item>
       <item quantity="other">%d છુપાયેલ આઇટમ બતાવો</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"સંકુચિત કરો"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"નેટવર્ક અને ઇન્ટરનેટ"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"મોબાઇલ"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ડેટા વપરાશ"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> સ્વચાલિત નિયમ ચાલુ કર્યો છે</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> સ્વચાલિત નિયમ ચાલુ કર્યા છે</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"ખલેલ પાડશો નહીં પસંદગીઓ"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ફક્ત પ્રાધાન્યતાને મંજૂરી"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"ખલેલ પાડશો નહીં"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"વર્તણૂક"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"આના ધ્વનિ અને વાઇબ્રેશનની મંજૂરી આપો"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"કોઈ ધ્વનિ નહીં"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"કોઈ ધ્વનિ નહીં (બિલકુલ શાંત)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g>ના સિવાય બીજો કોઈ ધ્વનિ નહીં"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"ઑટોમૅટિક નિયમો"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"ખલેલ પાડશો નહીં નિયમો સેટ કરો"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"અમુક સમયે ધ્વનિ અને વાઇબ્રેશન મર્યાદિત કરો"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"ફક્ત તારાંકિત સંપર્કોના"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"કોઈ નહીં"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"એલાર્મ્સ"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"અલાર્મ હંમેશા પ્રાધાન્યતા હોય છે અને અવાજ કરે છે"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"રિમાઇન્ડર"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ઇવેન્ટ્સ"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"બધા કૉલર્સ"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"પસંદ કરેલ કૉલર્સ"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"પુનરાવર્તિત કૉલર્સ"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"જો એ જ વ્યક્તિ <xliff:g id="MINUTES">%d</xliff:g> મિનિટના સમયગાળામાં બીજી વખત કૉલ કરે, તો તેને મંજૂરી આપો"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"જો <xliff:g id="MINUTES">%d</xliff:g> મીનિટના સમયગાળા દરમ્યાન તે જ વ્યક્તિ પાછી કૉલ કરે તો"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"આપમેળે ચાલુ"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"ક્યારેય નહીં"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"દર રાત્રે"</string>
@@ -3304,8 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"સિસ્ટમ સેટિંગ્સ સંશોધિત કરી શકે છે"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"સિસ્ટમ સેટિંગ્સ સંશોધિત કરો"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"ઍપ્લિકેશન સિસ્ટમ સેટિંગ્સ સંશોધિત કરવાની પરવાનગી"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"સિસ્ટમ સેટિંગને સંશોધિત કરવાની મંજૂરી આપો"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"આ પરવાનગી એપ્લિકેશનને સિસ્ટમ સેટિંગ્સ સંશોધિત કરવાની મંજૂરી આપે છે."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"હા"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"નહીં"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 2bf1552..6914357 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="one">छिपे हुए %d आइटम दिखाएं</item>
       <item quantity="other">छिपे हुए %d आइटम दिखाएं</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"छोटा करें"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"नेटवर्क और इंटरनेट"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"मोबाइल"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"डेटा खर्च"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> ऑटोमैटिक नियम चालू किए गए</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ऑटोमैटिक नियम चालू किए गए</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"परेशान न करें की प्राथमिकताएं"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"प्राथमिकता इनकी अनुमति देती है"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"परेशान न करें"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"व्यवहार"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"आवाज़ और वाइब्रेशन की अनुमति दें"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"कोई आवाज़ नहीं"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"कोई आवाज़ नहीं (एकदम मौन)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g> के अलावा कोई आवाज़ नहीं"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"अॉटोमैटिक नियम"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"परेशान न करें के नियम सेट करें"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"निश्चित समय पर ध्वनियों और कंपनों को सीमित करें"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"सिर्फ़ तारांकित संपर्कों से"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"कोई नहीं"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"अलार्म"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"अलार्म हमेशा प्राथमिकता वाले होते हैं और आवाज़ करते हैं"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"रिमाइंडर"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"इवेंट"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"सभी कॉल करने वाले (कॉलर)"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"चुनिंदा कॉल करने वाले (कॉलर)"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"बार-बार कॉल करने वाले (कॉलर)"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"अगर वही व्‍यक्‍ति <xliff:g id="MINUTES">%d</xliff:g> मिनट के अंदर दूसरी बार कॉल करता है, तो उसे अनुमति दें"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"अगर कोई व्यक्ति <xliff:g id="MINUTES">%d</xliff:g> मिनट के अंदर दोबारा कॉल करे"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"स्वचालित रूप से चालू"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"कभी नहीं"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"हर रात"</string>
@@ -3304,8 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"सिस्टम सेटिंग को बदल सकते हैं"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"सिस्‍टम सेटिंग बदलें"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"ऐप को सिस्‍टम सेटिंग बदलने की अनुमति"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"सेटिंग में बदलाव करने की अनुमति दें"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"यह अनुमति किसी ऐप को सिस्टम सेटिंग बदलने देती है."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"हां"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"नहीं"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 2cda06c..9a1bf65 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -2740,6 +2740,7 @@
       <item quantity="other">%d rejtett elem megjelenítése</item>
       <item quantity="one">%d rejtett elem megjelenítése</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Összecsukás"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Hálózat és internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobil"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"adathasználat"</string>
@@ -2842,8 +2843,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> automatikus szabály van bekapcsolva</item>
       <item quantity="one">1 automatikus szabály van bekapcsolva</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"A Ne zavarjanak funkció beállításai"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Csak a prioritást élvezők"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Ne zavarjanak"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Viselkedés"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Hangok és rezgések:"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Hang nélkül"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Hang nélkül (teljes némítás)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Hang nélkül, kivéve: <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatikus szabályok"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"A Ne zavarjanak szabályai"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Hangok és rezgések korlátozása"</string>
@@ -3019,13 +3026,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Csak a megcsillagozott névjegyektől"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Senkitől"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Riasztások"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Az ébresztések kiemeltek, hangjelzéssel járnak"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Emlékeztetők"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Események"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Minden hívó"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Kijelölt hívók"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Többször hívó személyek"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Ha <xliff:g id="MINUTES">%d</xliff:g> percen belül másodjára is hív valaki, akkor engedélyezze"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Ha <xliff:g id="MINUTES">%d</xliff:g> percen belül másodjára hív ugyanaz a személy"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Auto. bekapcsolás"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Soha"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Minden este"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 730be89..7465421 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="one">Show %d hidden items</item>
       <item quantity="other">Ցույց տալ %d թաքնված տարրեր</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Կոծկել"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Ցանց և ինտերնետ"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"բջջային"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"տվյալների օգտագործում"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> automatic rules turned on</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ավտոմատ կանոն միացված է</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"«Չանհանգստացնել» ռեժիմի կարգավորումներ"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Միայն կարևորները"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Չանհանգստացնել"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Տարբերակներ"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Թույլատրել ձայներ և թրթռոցներ`"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Առանց ձայնի"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Առանց ձայնի (կատարյալ լուռ)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Առանց ձայնի (միայն <xliff:g id="CATEGORIES">%1$s</xliff:g>)"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Կանոններ"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Չանհանգստացնել ռեժիմի կանոնների սահմանում"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Որոշ դեպքերում սահմանափակել ձայները և թրթռոցը"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Միայն աստղանշված կոնտակտներից"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ոչ ոքից"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Զարթուցիչ"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Զարթուցիչներն առաջնահերթ են և միշտ ձայն կարձակեն"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Հիշեցումներ"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Միջոցառումներ"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Բոլոր զանգողները"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Ընտրված զանգողներ"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Կրկնակի զանգեր"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Թույլատրել, եթե նույն անձը <xliff:g id="MINUTES">%d</xliff:g> րոպեի ընթացքում նորից է զանգում"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Եթե նույն անձը <xliff:g id="MINUTES">%d</xliff:g> րոպեի ընթացքում նորից է զանգում"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Ավտոմատ միացնել"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Երբեք"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Ամեն գիշեր"</string>
@@ -3304,8 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Կարող են փոփոխել համակարգի կարգավորումները"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Փոփոխել կարգավորումները"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Թույլատրել հավելվածին փոփոխել կարգավորումները"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Թույլատրել կարգավորումների փոփոխումը"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Միացնելով այս թույլտվությունը՝ թույլ եք տալիս հավելվածին փոփոխել համակարգի կարգավորումները:"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Այո"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ոչ"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index fb2444a..c98c4df 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="other">Tampilkan %d item tersembunyi</item>
       <item quantity="one">Tampilkan %d item tersembunyi</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Ciutkan"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Jaringan &amp; Internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"seluler"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"penggunaan data"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> aturan otomatis diaktifkan</item>
       <item quantity="one">1 aturan otomatis diaktifkan</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Preferensi Jangan Ganggu"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Hanya izinkan prioritas"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Jangan Ganggu"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Perilaku"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Izinkan suara dan getaran dari"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Tanpa suara"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Tanpa suara (Senyap Total)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Tanpa suara, kecuali <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Aturan otomatis"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Setel aturan Jangan Ganggu"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Batasi suara &amp; getaran pada waktu tertentu"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Hanya dari kontak berbintang"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Tidak ada"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarm"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarm selalu prioritas dan membunyikan suara"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Pengingat"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Acara"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Semua penelepon"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Penelepon yang dipilih"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Penelepon berulang"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Izinkan jika ada orang yang sama menelepon untuk kedua kalinya dalam waktu <xliff:g id="MINUTES">%d</xliff:g> menit"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Jika orang yang sama menelepon untuk kedua kalinya dalam waktu <xliff:g id="MINUTES">%d</xliff:g> menit"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Otomatis aktif"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Tidak pernah"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Setiap malam"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 94d8755..8783a6e 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="one">Sýna %d falið atriði</item>
       <item quantity="other">Sýna %d falin atriði</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Draga saman"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Netkerfi og internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"farsími"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"gagnanotkun"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="one">Kveikt á <xliff:g id="ON_COUNT">%d</xliff:g> sjálfvirkri reglu</item>
       <item quantity="other">Kveikt á <xliff:g id="ON_COUNT">%d</xliff:g> sjálfvirkum reglum</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Stillingar fyrir „Ónáðið ekki“"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Aðeins forgangsheimildir"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Ónáðið ekki"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Hegðun"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Leyfa hljóð og titring frá"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Ekkert hljóð"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Ekkert hljóð (algjör þögn)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Ekkert hljóð nema <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Sjálfvirkar reglur"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Stilla reglur „Ónáðið ekki“"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Takmarka hljóð og titring á vissum tíma"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Aðeins frá stjörnumerktum tengiliðum"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ekkert"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Vekjarar"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Viðvaranir eru ávallt í forgangi og með hljóði"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Áminningar"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Viðburðir"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Allir hringjendur"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Valdir hringjendur"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Hringt endurtekið"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Leyfa símtal ef sami aðili hringir aftur innan <xliff:g id="MINUTES">%d</xliff:g> mínútna"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Ef sami aðili hringir aftur innan <xliff:g id="MINUTES">%d</xliff:g> mínútna"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Kveikja sjálfkrafa"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Aldrei"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Á hverju kvöldi"</string>
@@ -3304,8 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Geta breytt kerfisstillingum"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Breyta kerfisstillingum"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Heimild forrits til að breyta kerfisstillingum"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Leyfa breytingar á kerfisstillingum"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Þessi heimild leyfir forriti að breyta kerfisstillingum."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Já"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nei"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 3c36407..52d743f 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="other">Mostra %d elementi nascosti</item>
       <item quantity="one">Mostra %d elemento nascosto</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Comprimi"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Rete e Internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"rete mobile"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"utilizzo dei dati"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> regole automatiche attivate</item>
       <item quantity="one">1 regola automatica attivata</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Preferenze Non disturbare"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"La priorità consente solo"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Non disturbare"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Comportamento"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Consenti suoni/vibrazioni per"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Nessun suono"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Nessun suono (silenzio totale)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Nessun suono, tranne per <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Regole automatiche"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Imposta regole Non disturbare"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limita suoni e vibrazioni in determinate ore"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Solo da contatti Speciali"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Nessuno"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Sveglie"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Sveglie sempre prioritarie, con audio attivo"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Promemoria"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Eventi"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Tutti i chiamanti"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Chiamate da utenti selezionati"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Chiamate ripetute"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Consenti se la stessa persona chiama una seconda volta entro <xliff:g id="MINUTES">%d</xliff:g> minuti"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Se la stessa persona chiama una seconda volta entro <xliff:g id="MINUTES">%d</xliff:g> minuti"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Attiva automaticam."</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Mai"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Ogni notte"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index d6ed334..8e91b11 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -2792,6 +2792,7 @@
       <item quantity="other">‏הצג %d פריטים מוסתרים</item>
       <item quantity="one">‏הצג פריט %d מוסתר</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"כיווץ"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"רשת ואינטרנט"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"סלולרית"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"שימוש בנתונים"</string>
@@ -2896,8 +2897,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> כללים אוטומטיים מופעלים</item>
       <item quantity="one">כלל אוטומטי אחד מופעל</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"העדפות של מצב \'נא לא להפריע\'"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"רק התראות בעדיפות"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"נא לא להפריע"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"התנהגות"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"אפשר להשמיע צלילים ורטט מ-"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"ללא צלילים"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"ללא צלילים (שקט מוחלט)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"ללא צלילים, למעט <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"כללים אוטומטיים"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"הגדרת כללים ל\'נא לא להפריע\'"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"הגבל צלילים ורטט בזמנים מסוימים"</string>
@@ -3081,13 +3088,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"רק מאלו שמסומנים בכוכב"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"בלי הודעות"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"התראות"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"התראות תמיד מקבלות עדיפות גבוהה ומשמיעות צליל"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"תזכורות"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"אירועים"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"כל המתקשרים"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"מתקשרים נבחרים"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"מתקשרים חוזרים"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"אם מגיעה שיחה ממישהו בפעם השנייה תוך <xliff:g id="MINUTES">%d</xliff:g> דקות, אפשר להציג התראה"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"אם מגיעה שיחה ממישהו בפעם השנייה תוך <xliff:g id="MINUTES">%d</xliff:g> דקות"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"הפעלה אוטומטית"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"אף פעם"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"בכל לילה"</string>
@@ -3386,8 +3394,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"יכולות לשנות את הגדרות המערכת"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"שינוי הגדרות המערכת"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"הרשאת אפליקציה לשנות את הגדרות המערכת"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"הרשאה לשנות את הגדרות המערכת"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"ההרשאה הזו מתירה לאפליקציה לשנות את הגדרות המערכת."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"כן"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"לא"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 97347f5..a16f6d5 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -2742,6 +2742,7 @@
       <item quantity="other">%d 件の非表示のアイテムを表示</item>
       <item quantity="one">%d 件の非表示のアイテムを表示</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"折りたたむ"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"ネットワークとインターネット"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"モバイル"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"データ使用量"</string>
@@ -2844,8 +2845,14 @@
       <item quantity="other">ON になっている自動ルールが <xliff:g id="ON_COUNT">%d</xliff:g> 件あります</item>
       <item quantity="one">ON になっている自動ルールが 1 件あります</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"マナーモードの設定"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"優先する通知のみを許可"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"マナーモード"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"動作"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"次の音やバイブレーションを許可"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"無音"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"無音（サイレント）"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g>以外は無音"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"自動ルール"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"マナーモード ルールの設定"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"所定の時間に音とバイブレーションを制限する"</string>
@@ -3021,13 +3028,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"スター付きの連絡先のみ"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"なし"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"アラーム"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"アラームは常に優先的な割り込みとして音が鳴ります"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"リマインダー"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"予定"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"すべての発信者"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"選択した発信者"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"同一発信者による再発信"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"同じ人が<xliff:g id="MINUTES">%d</xliff:g>分以内に再度発信することを許可する"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"同じ人から <xliff:g id="MINUTES">%d</xliff:g> 分以内に再度発信があった場合"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"自動的にON"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"設定しない"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"毎日の夜間"</string>
@@ -3308,8 +3316,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"システム設定を変更できるアプリ"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"システム設定の変更"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"アプリがシステム設定を変更する権限"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"システム設定の変更の許可"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"この権限により、アプリはシステム設定の変更ができるようになります。"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"可"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"不可"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 3f72838..da28507 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="other">%d დამალული ერთეულის ჩვენება</item>
       <item quantity="one">%d დამალული ერთეულის ჩვენება</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"ჩაკეცვა"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"ქსელი და ინტერნეტი"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"მობილური"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"მონაცემთა მოხმარება"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="other">ჩართულია <xliff:g id="ON_COUNT">%d</xliff:g> ავტომატური წესი</item>
       <item quantity="one">ჩართულია 1 ავტომატური წესი</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"„არ შემაწუხოთ“ რეჟიმის პარამეტრები"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"მხოლოდ პრიორიტეტულების დაშვება"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"არ შემაწუხოთ"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"ქცევა"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"ხმებისა და ვიბრაციის დაშვება"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"ხმის გარეშე"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"ხმის გარეშე (სრული სიჩუმე)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"ხმის გარეშე, გარდა შემდეგისა: <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"ავტომატური წესები"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"„არ შემაწუხოთ“ რეჟიმის წესების დაყენება"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"გარკვეულ დროს ხმებისა და ვიბრაციის შეზღუდვა"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"მხოლოდ ვარსკვლავიანი კონტაქტებისგან"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"არავისგან"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"მაღვიძარები"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"მაღვიძარები მუდამ პრიორიტეტულია და ხმას გამოსცემს"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"შეხსენებები"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ღონისძიებები"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"ყველა აბონენტი"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"არჩეული აბონენტები"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"აბონენტების გამეორება"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"თუ პიროვნება <xliff:g id="MINUTES">%d</xliff:g> წუთის მანძილზე მეორედ დარეკავს, დაიშვას"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"თუ პიროვნება <xliff:g id="MINUTES">%d</xliff:g> წუთის განმავლობაში მეორედ დარეკავს"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"ავტომატურად ჩაირთოს"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"არასოდეს"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"ყოველ ღამით"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 16e8400..468cece 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="other">%d жасырын элементті көрсету</item>
       <item quantity="one">%d жасырын элементті көрсету</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Жию"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Желі және интернет"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"мобильдік желі"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"деректерді пайдалану"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> автоматты ереже қосулы</item>
       <item quantity="one">1 автоматты ереже қосулы</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"\"Мазаламау\" режимі параметрлері"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Маңыздыларына ғана рұқсат"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Мазаламау"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Мінез-құлық"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Келесіден шыққан дыбыстар мен дірілдерге рұқсат беру"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Дыбыссыз"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Дыбыстар қосылмасын (толықтай үнсіз)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g> санатынан басқа дыбыстар қосылмасын"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Автоматты ережелер"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"\"Мазаламау\" ережесін орнату"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Белгілі бір уақытта дыбысты және дірілді шектеу"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Тек жұлдызша қойылған контактілерден"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ешқандай"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Дабылдар"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Дабылдар әрқашан басым маңызға ие және дауыстап беріледі"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Еске салғыштар"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Оқиғалар"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Барлық қоңырау шалушылар"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Таңдалған қоңырау шалушылар"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Қайта қоңырау шалушылар"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Бір адам <xliff:g id="MINUTES">%d</xliff:g> минуттың ішінде қайта қоңырау шалса, қоңырауы келсін"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Бір адам <xliff:g id="MINUTES">%d</xliff:g> минут ішінде қайта шалса"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Автоматты түрде қосу"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Ешқашан"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Түн сайын"</string>
@@ -3304,8 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Жүйелік параметрлерді өзгертуге болады"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Жүйелік параметрлерді өзгерту"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Қолданбаның жүйелік параметрлерді өзгерту рұқсаты"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Жүйелік параметрлерді өзгертуге рұқсат ету"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Бұл рұқсат қолданбаға жүйелік параметрлерді өзгертуге рұқсат етеді."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Иә"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Жоқ"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 13ffad9..96666f4 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="other">បង្ហាញធាតុ %d ដែលបានលាក់</item>
       <item quantity="one">បង្ហាញធាតុ %d ដែលបានលាក់</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"បង្រួម"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"បណ្តាញ និងអ៊ីនធឺណិត"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"ឧបករណ៍​ចល័ត"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ការប្រើទិន្នន័យ"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="other">ច្បាប់ស្វ័យប្រវត្តិ <xliff:g id="ON_COUNT">%d</xliff:g> បានបើក</item>
       <item quantity="one">ច្បាប់ស្វ័យប្រវត្តិ 1 បានបើក</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"ចំណូល​ចិត្ត​មុខងារ​កុំ​រំខាន"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"អនុញ្ញាតអាទិភាពប៉ុណ្ណោះ"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"កុំ​រំខាន"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"សកម្មភាព"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"អនុញ្ញាតឱ្យឮសំឡេង និងញ័រពី"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"គ្មានសំឡេង"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"គ្មានសំឡេង (បិទសំឡេងទាំងស្រុង)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"គ្មានសំឡេង លើកលែងតែ <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"ច្បាប់ស្វ័យប្រវត្តិ"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"កំណត់ច្បាប់សម្រាប់មុខងារកុំរំខាន"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"ដាក់កម្រិតលើសំឡេង និងការញ័រក្នុងពេលណាមួយ"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"ពីទំនាក់ទំនងមានផ្កាយតែប៉ុណ្ណោះ"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"គ្មាន"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"ម៉ោងរោទ៍"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"ម៉ោងរោទ៍មានអាទិភាព​ និងមានបន្លឺសំឡេងជានិច្ច"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"កម្មវិធីរំលឹក"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ព្រឹត្តិការណ៍"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"អ្នកហៅទូរស័ព្ទទាំងអស់"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"អ្នកហៅចូលបានជ្រើស"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"អ្នកហៅចូលសាជាថ្មី"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"ប្រសិនបើមនុស្សតែមួយហៅចូលមកលើកទីពីរនៅក្នុងរយៈពេល <xliff:g id="MINUTES">%d</xliff:g> នាទី អនុញ្ញាតចំពោះការហៅចូលនេះ។"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"ប្រសិនបើមនុស្សតែមួយហៅទូរសព្ទជាលើកទីពីរក្នុងរយៈពេល <xliff:g id="MINUTES">%d</xliff:g> នាទី"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"បើកដោយស្វ័យ​ប្រវត្តិ"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"កុំ"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"រាល់​យប់"</string>
@@ -3304,8 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"អាចកែការកំណត់ប្រព័ន្ធ"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"កែការកំណត់ប្រព័ន្ធ"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"សិទ្ធិអនុញ្ញាតកម្មវិធីកែការកំណត់ប្រព័ន្ធ"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"អនុញ្ញាតឱ្យកែសម្រួលការកំណត់ប្រព័ន្ធ"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"សិទ្ធិអនុញ្ញាតនេះអនុញ្ញាតឲ្យកម្មវិធីកែការកំណត់ប្រព័ន្ធ។"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"បាទ/ចាស"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"ទេ"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 67a42e4..a8a41d5 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="one">%d ಮರೆಮಾಡಲಾದ ಐಟಂಗಳನ್ನು ತೋರಿಸಿ</item>
       <item quantity="other">%d ಮರೆಮಾಡಲಾದ ಐಟಂಗಳನ್ನು ತೋರಿಸಿ</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"ಕುಗ್ಗಿಸಿ"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"ನೆಟ್‌ವರ್ಕ್ ಮತ್ತು ಇಂಟರ್ನೆಟ್"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"ಮೊಬೈಲ್‌‌"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ಡೇಟಾ ಬಳಕೆ"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> ಸ್ವಯಂಚಾಲಿತ ನಿಯಮಗಳು ಆನ್ ಆಗಿವೆ</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ಸ್ವಯಂಚಾಲಿತ ನಿಯಮಗಳು ಆನ್ ಆಗಿವೆ</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಆದ್ಯತೆಗಳು"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ಆದ್ಯತೆಯು ಕೆಳಗಿನವುಗಳಿಗೆ ಅನುಮತಿಸುತ್ತದೆ"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"ವರ್ತನೆ"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"ಧ್ವನಿ, ವೈಬ್ರೇಷನ್‌ಗೆ ಅನುಮತಿಸಿ"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"ಧ್ವನಿ ಇಲ್ಲ"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"ಧ್ವನಿ ಇಲ್ಲ (ಸಂಪೂರ್ಣ ನಿಶ್ಯಬ್ಧ)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g> ಹೊರತುಪಡಿಸಿ ಧ್ವನಿ ಇಲ್ಲ"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"ಸ್ವಯಂಚಾಲಿತ ನಿಯಮಗಳು"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ನಿಯಮ ಹೊಂದಿಸಿ"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"ಕೆಲವು ಸಲ ಧ್ವನಿ-ವೈಬ್ರೇಶನ್ ಸೀಮಿತ"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"ನಕ್ಷತ್ರ ಹಾಕಲಾದ ಸಂಪರ್ಕಗಳಿಂದ ಮಾತ್ರ"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"ಯಾವುದೂ ಇಲ್ಲ"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"ಅಲಾರಮ್‌ಗಳು"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"ಅಲಾರಾಂಗೆ ಯಾವಾಗಲೂ ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿ ಮತ್ತು ಧ್ವನಿ ಮಾಡಿ"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"ಜ್ಞಾಪನೆಗಳು"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ಈವೆಂಟ್‌ಗಳು"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"ಎಲ್ಲ ಕರೆದಾರರು"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"ಆಯ್ಕೆಮಾಡಲಾದ ಕರೆದಾರರು"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"ಪುನರಾವರ್ತಿತ ಕರೆದಾರರು"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"ಒಂದು ವೇಳೆ ಒಬ್ಬನೇ ವ್ಯಕ್ತಿ <xliff:g id="MINUTES">%d</xliff:g> ನಿಮಿಷಗಳೊಳಗೆ ಎರಡನೇ ಬಾರಿ ಕರೆ ಮಾಡಿದರೆ, ಅನುಮತಿಸಿ"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"ಒಂದು ವೇಳೆ ಒಬ್ಬನೇ ವ್ಯಕ್ತಿ <xliff:g id="MINUTES">%d</xliff:g> ನಿಮಿಷಗಳೊಳಗೆ ಎರಡನೇ ಬಾರಿ ಕರೆ ಮಾಡಿದರೆ"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್‌ ಆಗುವಿಕೆ"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"ಎಂದಿಗೂ ಬೇಡ"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"ಪ್ರತಿ ರಾತ್ರಿ"</string>
@@ -3304,8 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"ಸಿಸ್ಟಂ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮಾರ್ಪಡಿಸಬಹುದು"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"ಸಿಸ್ಟಂ ಸೆಟ್ಟಿಂಗ್‍ಗಳನ್ನು ಮಾರ್ಪಡಿಸಿ"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"ಅಪ್ಲಿಕೇಶನ್ ಮಾರ್ಪಡಿಸಲು ಸಿಸ್ಟಂ ಸೆಟ್ಟಿಂಗ್‍ಗಳ ಅನುಮತಿ"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"ಮಾರ್ಪಡಿಸುವ ಸಿಸ್ಟಮ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"ಈ ಅನುಮತಿಯು ಸಿಸ್ಟಂ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅನುಮತಿಸುತ್ತದೆ."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"ಹೌದು"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"ಇಲ್ಲ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 0b1e974..efb8572 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="other">%d개의 숨겨진 항목 표시</item>
       <item quantity="one">%d개의 숨겨진 항목 표시</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"접기"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"네트워크 및 인터넷"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"모바일"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"데이터 사용"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="other">자동 규칙 <xliff:g id="ON_COUNT">%d</xliff:g>개 사용 설정됨</item>
       <item quantity="one">자동 규칙 1개 사용 설정됨</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"알림 일시중지 환경설정"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"중요 알림만 허용"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"알림 일시중지"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"동작"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"다음의 소리 및 진동 허용"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"음소거"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"음소거(모두 차단)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g>을(를) 제외한 모든 소리 음소거"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"자동 규칙"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"알림 일시중지 규칙 설정"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"특정 시간에 소리 및 진동 제한"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"별표 표시한 연락처만"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"없음"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"알람"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"알림이 항상 중요 알림으로 설정되며 소리로 알림"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"알림"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"이벤트"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"모든 발신자"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"선택한 발신자"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"반복 발신자"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"<xliff:g id="MINUTES">%d</xliff:g>분 이내에 같은 사람이 다시 전화를 걸면 알림을 허용합니다."</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"<xliff:g id="MINUTES">%d</xliff:g>분 이내에 같은 사람이 다시 전화를 거는 경우"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"자동 사용 설정"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"사용 안함"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"매일 밤"</string>
@@ -3304,8 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"시스템 설정 수정 가능"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"시스템 설정 수정"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"앱의 시스템 설정 수정 권한"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"시스템 설정 수정 허용"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"이 권한은 앱이 시스템 설정을 수정하도록 허용합니다."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"예"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"아니요"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index a30cfaf..e6064dc 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -2741,6 +2741,7 @@
       <item quantity="other">Жашырылган %d нерсе көрсөтүлсүн</item>
       <item quantity="one">Жашырылган %d нерсе көрсөтүлсүн</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Жыйыштыруу"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Тармак жана Интернет"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"мобилдик"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"дайындардын колдонулушу"</string>
@@ -2843,8 +2844,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> эреже автоматтык түрдө иштейт</item>
       <item quantity="one">1 эреже автоматтык түрдө иштейт</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"\"Тынчымды алба\" жөндөөлөрү"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Шашылыш эскертмелер гана"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Тынчымды алба"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Аракеттери"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Үндөр жана дирилдөөгө уруксат"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Добушу жок"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Добушу жок (Тымтырс)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g> катег-н башка добуш чыкпасын"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Автоматтык эрежелер"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"\"Тынчымды алба\" режиминин эрежелери"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Белгилүү бир убакыттарда эскертмелерди өчүрүү"</string>
@@ -3020,13 +3027,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Жылдызчаланган байланыштардан гана"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Эч бир"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Ойготкучтар"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Ойготкучтарга артыкчылык берилип, үндөрү чыксын"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Эстеткичтер"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Окуялар"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Бардык чалуучулар"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Тандалган чалуучулар"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Кайра чалуучулар"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Эгер бир эле адам <xliff:g id="MINUTES">%d</xliff:g> мүнөттүн ичинде кайра чалса, уруксат берилсин"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Эгер бир эле адам <xliff:g id="MINUTES">%d</xliff:g> мүнөттүн ичинде кайра чалса"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Автоматтык түрдө күйүү"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Эч качан"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Түн сайын"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 7fec7f2..0c00b65 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="other">ສະແດງ %d ລາຍການທີ່ເຊື່ອງໄວ້</item>
       <item quantity="one">ສະແດງ %d ລາຍການທີ່ເຊື່ອງໄວ້</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"ຫຍໍ້ເຂົ້າ"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"ເຄືອຂ່າຍ ແລະ ອິນເຕີເນັດ"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"ມືຖື"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ການນຳໃຊ້ຂໍ້ມູນ"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="other">ເປີດໃຊ້ <xliff:g id="ON_COUNT">%d</xliff:g> ກົດອັດຕະໂນມັດແລ້ວ</item>
       <item quantity="one">ເປີດໃຊ້ 1 ກົດອັດຕະໂນມັດແລ້ວ</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"ການຕັ້ງຄ່າຫ້າມລົບກວນ"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ບຸ​ລິ​ມະ​ສິດ​ເທົ່າ​ນັ້ນ​ທີ່​ອະ​ນຸ​ຍາດ"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"ຫ້າມລົບກວນ"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"ພຶດຕິກຳ"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"ອະນຸຍາດສຽງ ແລະ ການສັ່ນເຕືອນຈາກ"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"ບໍ່ມີສຽງ"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"ບໍ່ມີສຽງ (ງຽບໝົດ)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"ບໍ່ມີສຽງ ຍົກເວັ້ນ <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"ກົດ​ລະ​ບຽບ​ອັດ​ຕະ​ໂນ​ມັດ"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"ຕັ້ງກົດຂອງການຫ້າມລົບກວນ"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"ຈຳກັດສຽງ ແລະ ການສັ່ງໃນບາງເວລາ"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"ຈາກ​ລາຍ​ຊື່​ຕິດ​ຕໍ່​ໃສ່​ດາວ​ໄວ້​ເທົ່າ​ນັ້ນ"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"ບໍ່ມີ"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"ໂມງປຸກ"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"ສຽງໂມງປຸກແມ່ນມີຄວາມສຳຄັນສະເໝີ ແລະ ຈະເປີດສຽງເຕືອນ"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"ການແຈ້ງເຕືອນ"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ກິດຈະກຳ"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"ຜູ້​ໂທທັງ​ໝົດ"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"ຜູ້​ໂທ​ທີ່​ເລືອກ​ໄວ້"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"ຜູ້ໂທຊ້ຳໆ"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"ອະນຸຍາດໃຫ້ຮັບສາຍໄດ້ຖ້າຄົນດຽວກັນໂທຊ້ຳໃນ <xliff:g id="MINUTES">%d</xliff:g> ນາທີ"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"ຫາກຄົນດຽວກັນໂທເທື່ອທີສອງພາຍໃນໄລຍະເວລາ <xliff:g id="MINUTES">%d</xliff:g> ນາທີ"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"ເປີດ​ໂດຍ​ອັດ​ຕະ​ໂນ​ມັດ"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"ບໍ່ໃຊ້"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"ທຸກ​ທ່ຽງ​ຄືນ"</string>
@@ -3304,8 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"ສາ​ມາດແກ້​ໄຂການ​ຕັ້ງ​ຄ່າ​ລະ​ບົບ​ໄດ້"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"ແກ້ໄຂການຕັ້ງຄ່າລະບົບ"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"ການ​ອະ​ນຸ​ຍາດ​ແອັບ​ແກ້​ໄຂ​ການ​ຕັ້ງ​ຄ່າ​ລະ​ບົບ"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"ອະນຸຍາດໃຫ້ແກ້ໄຂການຕັ້ງຄ່າລະບົບໄດ້"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"ການ​ອະ​ນຸ​ຍາດ​ນີ້​ອະ​ນຸ​ຍາດໃຫ້​ແອັບດັດ​ແປງ​ການ​ຕັ້ງ​ຄ່າ​ລະ​ບົບ​ໄດ້."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"​ແມ່ນ​ແລ້ວ"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"ບໍ່"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 75ceb12..13d34a1 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -2790,6 +2790,7 @@
       <item quantity="many">Rodyti %d paslėpto elemento</item>
       <item quantity="other">Rodyti %d paslėptų elementų</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Sutraukti"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Tinklas ir internetas"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobilusis"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"duomenų naudojimas"</string>
@@ -2894,8 +2895,14 @@
       <item quantity="many"><xliff:g id="ON_COUNT">%d</xliff:g> automatinės taisyklės įjungta</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> automatinių taisyklių įjungta</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Netrukdymo režimo nuostatos"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Tik pagal prioritetą"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Netrukdymo režimas"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Elgsena"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Leisti garsus ir vibravimą iš"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Nėra garso"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Nėra garso (visiška tyla)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Nėra garso, išskyrus <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatinės taisyklės"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Nustatyti netrukdymo režimo taisykles"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Apriboti garsus ir vibravimą tam tikru metu"</string>
@@ -3079,13 +3086,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Tik iš žvaigždutėmis pažymėtų kontaktų"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Nėra"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Signalai"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Įsp. visada yra priorit. ir apie juos pran. garsu"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Priminimai"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Įvykiai"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Visi skambintojai"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Pasirinkti skambintojai"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Pakartotinai skambinantys"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Jei asmuo skambina antrą kartą per <xliff:g id="MINUTES">%d</xliff:g> min. laikotarpį, leisti skambutį"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Jei asmuo skambina antrą kartą per <xliff:g id="MINUTES">%d</xliff:g> min. laikotarpį"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automatiškai įjungti"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Niekada"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Kiekvieną naktį"</string>
@@ -3384,8 +3392,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Gali keisti sistemos nustatymus"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Keisti sistemos nustatymus"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Programos leidimas keisti sistemos nustatymus"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Leisti keisti sistemos nustatymus"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Programai bus leidžiama keisti sistemos nustatymus."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Taip"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ne"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index ae9fa16..8dd08a1 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -2764,6 +2764,7 @@
       <item quantity="one">Rādīt %d slēptu vienumu</item>
       <item quantity="other">Rādīt %d slēptus vienumus</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Sakļaut"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Tīkls un internets"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobilais tīkls"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"datu lietojums"</string>
@@ -2867,8 +2868,14 @@
       <item quantity="one">Ieslēgta <xliff:g id="ON_COUNT">%d</xliff:g> automātiskā kārtula</item>
       <item quantity="other">Ieslēgtas <xliff:g id="ON_COUNT">%d</xliff:g> automātiskās kārtulas</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"“Netraucēt” preferences"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Tikai prioritārie"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Netraucēt"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Rīcība"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Atļaut skaņas un vibrāciju no"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Bez skaņas"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Bez skaņas (pilnīgs klusums)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Bez skaņas, izņemot <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Autom. kārtulas"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"“Netraucēt” kārtulu iestatīšana"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Ierobežot skaņu un vibrāciju noteiktā laikā"</string>
@@ -3048,13 +3055,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Tikai no kontaktpersonām ar zvaigznīti"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Nav"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Signāli"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Signāliem vienmēr ir prioritāte un skaņa"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Atgādinājumi"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Notikumi"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Visi zvanītāji"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Atlasīti zvanītāji"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Atkārtoti zvani"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Atļaut, ja viena un tā pati persona zvana <xliff:g id="MINUTES">%d</xliff:g> minūšu periodā"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Ja tā pati persona <xliff:g id="MINUTES">%d</xliff:g> minūšu laikā zvana vēlreiz"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automātiski ieslēgt"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nekad"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Katru nakti"</string>
@@ -3344,8 +3352,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Var pārveidot sistēmas iestatījumus"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Iestatījumu pārveidošana"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Atļauja lietotnei pārveidot sistēmas iestatījumus"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Atļaut pārveidot sistēmas iestatījumus"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Ar šo atļauju lietotnes var pārveidot sistēmas iestatījumus."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Jā"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nē"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 5b96d52..04943fe 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="one">Прикажи %d сокриена ставка</item>
       <item quantity="other">Прикажи %d сокриени ставки</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Собери"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Мрежа и Интернет"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"мобилна"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"потрошен сообраќај"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="one">Вклучено е <xliff:g id="ON_COUNT">%d</xliff:g> автоматско правило</item>
       <item quantity="other">Вклучени се <xliff:g id="ON_COUNT">%d</xliff:g> автоматски правила</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Поставки за „Не вознемирувај“"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Дозволува само приоритетно"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Не вознемирувај"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Однесување"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Дозволете звуци и вибрации од"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Без звук"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Без звук (Целосна тишина)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Без звук, освен <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Автоматски правила"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Правила за „Не вознемирувај“"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Ограничете звуци и вибрации"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Само од контактите со ѕвезда"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Никој"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Аларми"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Алармите секогаш се приоритетни и со звук"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Потсетници"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Настани"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Сите повикувачи"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Избрани повикувачи"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Редовни повикувачи"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Доколку истото лице повикува по втор пат во период од <xliff:g id="MINUTES">%d</xliff:g> минути, дозволете"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Доколку истото лице повикува по втор пат во период од <xliff:g id="MINUTES">%d</xliff:g> минути"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Вклучи автоматски"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Никогаш"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Секоја ноќ"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index b32c448..b925370 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="other">മറച്ച %d ഇനങ്ങൾ കാണിക്കുക</item>
       <item quantity="one">മറച്ച %d ഇനം കാണിക്കുക</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"ചുരുക്കുക"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"നെറ്റ്‌വർക്കും ഇന്റർനെറ്റും"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"മൊബൈല്‍"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ഡാറ്റ ഉപയോഗം"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> സ്വമേധയായുള്ള നയങ്ങൾ ഓണാക്കി</item>
       <item quantity="one">1 സ്വമേധയായുള്ള നയം ഓണാക്കി</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"\'ശല്യപ്പെടുത്തരുത്\' മുൻഗണന"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"മുൻഗണനയുള്ളവ മാത്രം"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"ശല്യം ചെയ്യരുത്"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"പ്രവർത്തനരീതി"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"ഇനിപ്പറയുന്നതിൽ നിന്നുള്ള ശബ്ദങ്ങളും അലാറമുകളും അനുവദിക്കുക"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"ശബ്‌ദമില്ല"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"ശബ്ദമില്ല (മൊത്തം നിശബ്ദം)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g> ഒഴികെ ശബ്ദമില്ല"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"സ്വയമേയുള്ള നയങ്ങൾ"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"\'ശല്യപ്പെടുത്തരുത്\' നിയമങ്ങൾ സജ്ജമാക്കുക"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"ചില സമയത്ത് ശബ്‌ദവും വൈബ്രേഷനും പരിമിതപ്പെടുത്തുക"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"നക്ഷത്രമിട്ട കോൺടാക്‌റ്റിൽ നിന്നുമാത്രം"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"ആരിൽ നിന്നും വേണ്ട"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"അലാറങ്ങൾ"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"അലാറങ്ങൾക്ക് എപ്പോഴും മുൻഗണന നൽകി ശബ്‌ദം കേൾപ്പിക്കുന്നു"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"റിമൈൻഡറുകൾ"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ഇവന്റുകൾ"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"കോൾ ചെയ്യുന്ന എല്ലാവരും"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"തിരഞ്ഞെടുത്ത കോളർമാർ"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"ആവർത്തിച്ച് വിളിക്കുന്നവർ"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"<xliff:g id="MINUTES">%d</xliff:g> മിനിറ്റിനുള്ളിൽ ഒരേ വ്യക്തി തന്നെ രണ്ടാമതും വിളിക്കുകയാണെങ്കിൽ, അത് അനുവദിക്കുക"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"<xliff:g id="MINUTES">%d</xliff:g> മിനിറ്റ് കാലയളവിനുള്ളിൽ അതേ വ്യക്തി രണ്ടാമതൊരു തവണ വിളിക്കുകയാണെങ്കിൽ"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"ഓട്ടോമാറ്റിക്കായി ഓണാക്കുക"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"ഒരിക്കലും"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"എല്ലാ രാത്രിയും"</string>
@@ -3304,8 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"സിസ്റ്റം ക്രമീകരണം പരിഷ്കരിക്കാൻ കഴിയും"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"സിസ്റ്റം ക്രമീകരണങ്ങൾ പരിഷ്‌ക്കരിക്കുക"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"സിസ്റ്റം ക്രമീകരണ അനുമതിയെ ആപ്പ് പരിഷ്കരിക്കുന്നു"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"സിസ്‌റ്റം ക്രമീകരണം മാറ്റാൻ അനുവദിക്കുക"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"സിസ്റ്റം ക്രമീകരണം പരിഷ്കരിക്കുന്നതിന് ഒരു ആപ്പിനെ ഈ അനുമതി അനുവദിക്കുന്നു."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"അതെ"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"ഇല്ല"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 22af7fa..dbb74d1 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="other">Нуусан %d зүйлийг харуулах</item>
       <item quantity="one">Нуусан %d зүйлийг харуулах</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Буулгах"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Сүлжээ &amp; интернэт"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"мобайл"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"дата ашиглалт"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> автомат дүрмийг асаасан</item>
       <item quantity="one">1 автомат дүрмийг асаасан</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Бүү саад бол сонголт"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Зөвхөн хамгийн чухал гэснийг зөвшөөрнө"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Бүү саад бол"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Тохиргоо"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Дуу, чичиргээг дараахаас зөвшөөрөх"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Дуугүй"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Дуугүй (Бүгдийг нь дуугүй болгох)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g>-с өөр дуу алга"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Автомат журам"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Бүү саад бол дүрмийг тохируулах"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Дуу, чичиргээг тодорхой хугацаагаар хязгаарлах"</string>
@@ -3015,13 +3022,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Зөвхөн одтой харилцагчаас"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Байхгүй"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Сэрүүлэг"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Сэрүүлгийг тогтмол чухалчилж дуугаргана"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Сануулагч"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Үйл явдал"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Бүх дуудлага"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Сонгосон дуудлага хийгч"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Давтан дуудлага хийгч"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Хэрэв нэг хүн <xliff:g id="MINUTES">%d</xliff:g> минутын дотор хоёр дахь удаагаа дуудлага хийвэл үүнийг хүлээн авна."</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Хэрэв нэг хүн <xliff:g id="MINUTES">%d</xliff:g> минутын дотор хоёр дахь удаагаа дуудлага хийвэл"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Автоматаар асаах"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Хэзээ ч үгүй"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Шөнө бүр"</string>
@@ -3302,8 +3310,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Системийн тохиргоо өөрчилж болно"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Системийн тохиргоог өөрчлөх"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Апп-ын системийн тохиргоо өөрчлөх зөвшөөрөл"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Системийн тохиргоог өөрчлөхийг зөвшөөрөх"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Энэ нь апп-д системийн тохиргоог өөрчлөхийг зөвшөөрдөг."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Тийм"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Үгүй"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index c521720..15cd3ec 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="one">%d लपविलेला आयटम दर्शवा</item>
       <item quantity="other">%d लपविलेले आयटम दर्शवा</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"कोलॅप्स"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"नेटवर्क आणि इंटरनेट"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"मोबाइल"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"डेटा वापर"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> स्वयंचलित नियम चालू केला</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> स्वयंचलित नियम चालू केले</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"व्यत्यय आणू नका प्राधान्ये"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"केवळ प्राधान्यला अनुमती देते"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"व्यत्यय आणू नका"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"वर्तन"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"यांचे ध्वनी आणि व्हायब्रेशन राहू द्या"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"कोणताही ध्वनी नाही"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"ध्वनी नाही (संपूर्ण शांतता)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g> खेरीज कोणताही ध्वनी नाही"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"स्वयंचलित नियम"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"व्यत्यय आणू नका नियम सेट करा"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"विशिष्ट वेळी ध्वनी आणि कंपने मर्यादित करा"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"केवळ तारांकित संपर्कांकडून"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"काहीही नाही"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"अलार्म"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"अलार्म नेहमी प्राधान्य दिलेले असतात आणि आवाज करतात"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"स्मरणपत्रे"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"इव्हेंट"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"सर्व कॉलकर्ता"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"निवडलेले कॉलर"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"नियमित कॉलर"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"एखादी व्‍यक्ती <xliff:g id="MINUTES">%d</xliff:g> मिनिटांत दुसर्‍याांदा कॉल करत असेल तर, त्यास अनुमती द्या"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"एकाच व्यक्तीने <xliff:g id="MINUTES">%d</xliff:g> मिनिटांच्या आत दुसर्‍या वेळी कॉल केल्यास"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"स्वयंचलितपणे चालू करा"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"कधीही नाही"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"प्रत्येक रात्री"</string>
@@ -3304,8 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"सिस्‍टीम सेटिंग्ज सुधारित करू शकतात"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"सिस्टम सेटिंग्ज सुधारित करा"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"अॅप सिस्‍टीम सेटिंग्ज परवानगी सुधारित करतो"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"सिस्‍टम सेटिंग्‍ज सुधारण्‍याची अनुमती द्या"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"ही परवानगी अॅपला सिस्टम सेटिंग्ज सुधारित करण्‍याची अनुमती देते."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"होय"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"नाही"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 56b8a8a..9ff1e0b 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="other">Tunjukkan %d item yang tersembunyi</item>
       <item quantity="one">Tunjukkan %d item yang tersembunyi</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Runtuhkan"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Rangkaian &amp; Internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mudah alih"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"penggunaan data"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> peraturan automatik dihidupkan</item>
       <item quantity="one">1 peraturan automatik dihidupkan</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Pilihan Jangan Ganggu"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Benarkan keutamaan sahaja"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Jangan Ganggu"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Gelagat"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Benarkan bunyi &amp; getaran drp"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Tiada bunyi"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Tiada bunyi (Senyap Sepenuhnya)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Tiada bunyi kecuali <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Peraturan automatik"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Ttpkan peraturan Jangan Ganggu"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Hadkan bunyi &amp; getaran pada masa tertentu"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Daripada kenalan dibintangkan sahaja"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Tiada"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Penggera"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Penggera sentiasa dianggap keutamaan dan berbunyi"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Peringatan"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Acara"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Semua pemanggil"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Pemanggil dipilih"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Pemanggil berulang"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Jika orang yang sama memanggil sekali lagi dalam tempoh <xliff:g id="MINUTES">%d</xliff:g> minit, benarkannya"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Jika orang yang sama memanggil sekali lagi dalam tempoh <xliff:g id="MINUTES">%d</xliff:g> minit"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Hidupkan secara automatik"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Jangan sekali-kali"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Setiap malam"</string>
@@ -3304,8 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Boleh mengubah suai tetapan sistem"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Ubah suai tetapan sistem"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Kebenaran apl mengubah suai tetapan sistem"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Benarkan pengubahsuaian tetapan sistem"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Kebenaran ini membolehkan apl mengubah suai tetapan sistem."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ya"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Tidak"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 042d9dc..d825be1 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="other">ဖျောက်ထားသည့် %d ခုကို ပြပါ</item>
       <item quantity="one">ဖျောက်ထားသည့် %d ခုကို ပြပါ</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"ချုံ့ကြည့်ရန်"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"ကွန်ရက်နှင့် အင်တာနက်"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"မိုဘိုင်း"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"‌‌ဒေတာသုံးစွဲမှု"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="other">အလိုအလျောက် စည်းမျဉ်း <xliff:g id="ON_COUNT">%d</xliff:g> ခုကို ဖွင့်ထားသည်</item>
       <item quantity="one">အလိုအလျောက် စည်းမျဉ်း ၁ ခုကို ဖွင့်ထားသည်</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"မနှောင့်ယှက်ရ ရွေးချယ်မှု"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ဦးစားပေးများသာ ခွင့်ပြုရန်"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"မနှောင့်ယှက်ရ"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"အပြုအမူ"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"ဤနေရာမှ အသံနှင့် တုန်ခါမှုများကို ခွင့်ပြုပါ-"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"အသံပိတ်ထားသည်"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"အသံပိတ်ထားသည် (လုံးဝမမြည်ပါ)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g> မှလွဲ၍ အခြားအသံ ပိတ်ထားသည်"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"အလိုအလျောက်စည်းမျဉ်းများ"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"မနှောင့်ယှက်ရ စည်းမျဉ်းထည့်ရန်"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"အချို့အချိန်များ၌ ကန့်သတ်ရန်"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"ကြယ်ပွင့်ပြ အဆက်အသွယ်များဆီမှသာ"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"မရှိ"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"နှိုးစက်များ"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"နှိုးစက်များကို အမြဲတမ်း ဦးစားပေး၍ အသံမြည်ပေးရန်"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"သတိပေးချက်များ"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"အစီအစဉ်များ"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"ခေါ်ဆိုသူ အားလုံး"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"ရွေးချယ်ထားသည့် ခေါ်ဆိုသူများ"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"အကြိမ်ကြိမ်ခေါ်ဆိုသူများ"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"<xliff:g id="MINUTES">%d</xliff:g> မိနစ်အတွင်း ဖုန်းထပ်ခေါ်သူကို ခွင့်ပြုမည်။"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"<xliff:g id="MINUTES">%d</xliff:g> မိနစ်အတွင်း တစ်ဦးတည်းက ဖုန်းထပ်ခေါ်လျှင်"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"အလိုအလျောက် ဖွင့်ရန်"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"ဘယ်တော့မှ"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"ညတိုင်း"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index b419f0b..4bf0b8a 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="other">Vis %d skjulte elementer</item>
       <item quantity="one">Vis %d skjult element</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Skjul"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Nettverk og Internett"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobil"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"databruk"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> automatiske regler er slått på</item>
       <item quantity="one">1 automatisk regel er slått på</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Innstillinger for Ikke forstyrr"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioritet tillater bare"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Ikke forstyrr"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Atferd"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Tillat lyd og vibrasjoner fra"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Ingen lyd"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Ingen lyd (total stillhet)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Ingen lyd, unntatt <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatiske regler"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Angi Ikke forstyrr-regler"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Begrens lyd og vibrering til bestemte tider"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Bare fra stjernemerkede kontakter"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ingen"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmer"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarmer er alltid prioritert og avgir lyd"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Påminnelser"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Hendelser"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Alle oppringere"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Utvalgte oppringere"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Gjentatte anrop"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Tillat hvis den samme personen ringer enda en gang innen <xliff:g id="MINUTES">%d</xliff:g> minutter"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Hvis samme person ringer enda en gang innen <xliff:g id="MINUTES">%d</xliff:g> minutter"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Slå på automatisk"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Aldri"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Hver kveld"</string>
@@ -3304,8 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Kan endre systeminnstillingene"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Endre systeminnstillingene"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Apptillatelse til å endre systeminnstillingene"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Tillat endring av systeminnstillingene"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Med denne tillatelsen kan apper endre systeminnstillingene."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nei"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index c6b2597..d15f550 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -1454,7 +1454,7 @@
     <string name="safety_and_regulatory_info" msgid="5103161279848427185">"सुरक्षा र नियामक सम्बन्धी मार्गदर्शन"</string>
     <string name="copyright_title" msgid="865906688917260647">"प्रतिलिपि अधिकार"</string>
     <string name="license_title" msgid="1990487604356037871">"इजाजतपत्र"</string>
-    <string name="terms_title" msgid="7697580845616764642">"सेवा सर्तहरू"</string>
+    <string name="terms_title" msgid="7697580845616764642">"सेवाका सर्तहरू"</string>
     <string name="webview_license_title" msgid="2813507464175738967">"प्रणाली वेबभ्यु लाइसेन्स"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"वालपेपरहरु"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"स्याटलाइट कल्पना प्रदायकहरू:\n©२०१४ CNES / Astrium, DigitalGlobe, Bluesky"</string>
@@ -2738,6 +2738,7 @@
       <item quantity="other">लुकाइएका %d वस्तुहरू देखाउनुहोस्</item>
       <item quantity="one">लुकाइएको %d वस्तु देखाउनुहोस्</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"संक्षिप्त गर्नुहोस्"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"नेटवर्क र इन्टरनेट"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"मोबाइल"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"डेटाको प्रयोग"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> स्वचालित नियम सक्रिय गरिए</item>
       <item quantity="one">१ स्वचालित नियम सक्रिय गरियो</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"बाधा नपुर्‍याउनुहोस् मोडका प्राथमिकताहरू"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"प्राथमिकताले मात्र अनुमति  दिन्छ"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"बाधा नपुऱ्याउनुहोस्"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"व्यवहार"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"निम्नबाट आउने आवाज र कम्पनहरूलाई अनुमति दिनु"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"कुनै पनि आवाज ननिकाल्ने"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"आवाज ननिकाल्ने (पूर्ण शान्त)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"निम्नबाहेक कुनै आवाज ननिकाल्ने <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"स्वचालित नियमहरू"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"बाधा नपुर्‍याउनुहोस् मोडका नियमहरू सेट गर्नुहोस्"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"निश्चित समयहरूमा आवाज र कम्पनमाथि रोक लगाउनुहोस्"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"ताराङ्कित सम्पर्कहरूबाट मात्र"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"कुनै पनि होइन"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"अलार्महरू"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"अलार्महरू सधैँ प्राथमिक हुन्छन् र तिनीहरूले ध्वनि बजाउँछन्"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"रिमान्डरहरू"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"घटनाहरू"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"सबै कल गर्ने व्यक्तिहरू"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"कलरहरू चयन गर्नुहोस्"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"कलरहरू दोरोर्‍याउनुहोस्"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"यदि एउटै व्यक्तिले <xliff:g id="MINUTES">%d</xliff:g> मिनेट अवधिभित्र दोस्रो पटक कल गर्छ भने यसलाई अनुमति दिनुहोस्।"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"एउटै व्यक्तिले <xliff:g id="MINUTES">%d</xliff:g> मिनेटको अवधिमा दोस्रो पटक कल गरेको खण्डमा"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"स्वचालित रूपमा चालू"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"कहिले पनि होइन"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"हरेक रात"</string>
@@ -3304,8 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"प्रणाली सेटिङहरू परिमार्जन गर्न सक्ने"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"प्रणाली सेटिङहरू परिमार्जन गर्नुहोस्"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"अनुप्रयोगद्वारा प्रणाली सेटिङहरू अनुमति परिवर्तन"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"प्रणालीका सेटिङहरू परिमार्जन गर्न दिनुहोस्"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"यस अनुमतिले अनुप्रयोगलाई प्रणाली सेटिङहरू परिमार्जन गर्न दिन्छ।"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"हो"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"होइन"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 6b7a33e..5b64bb9 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="one">%d ਲੁਕੀਆਂ ਹੋਈਆਂ ਆਈਟਮਾਂ  ਦਿਖਾਓ </item>
       <item quantity="other">%d ਲੁਕੀਆਂ ਹੋਈਆਂ ਆਈਟਮਾਂ  ਦਿਖਾਓ </item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"ਸਮੇਟੋ"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"ਨੈੱਟਵਰਕ ਅਤੇ ਇੰਟਰਨੈੱਟ"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"ਮੋਬਾਈਲ"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ਡਾਟਾ ਵਰਤੋਂ"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> ਸਵੈਚਲਿਤ ਨਿਯਮ ਚਾਲੂ ਕੀਤਾ ਹੋਇਆ ਹੈ</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ਸਵੈਚਲਿਤ ਨਿਯਮ ਚਾਲੂ ਕੀਤੇ ਹੋਏ ਹਨ</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਤਰਜੀਹਾਂ"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ਕੇਵਲ ਤਰਜੀਹੀ ਦੀ ਆਗਿਆ ਹੈ"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"ਵਰਤਾਅ"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"ਇਸ ਨੂੰ ਧੁਨੀਆਂ ਅਤੇ ਥਰਥਰਾਹਟਾਂ ਕਰਨ ਦਿਓ"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"ਕੋਈ ਧੁਨੀ ਨਹੀਂ"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"ਕੋਈ ਧੁਨੀ ਨਹੀਂ (ਪੂਰੀ ਖਾਮੋਸ਼ੀ)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"ਸਿਵਾਏ <xliff:g id="CATEGORIES">%1$s</xliff:g> ਕੋਈ ਧੁਨੀ ਨਹੀਂ"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"ਸਵੈਚਲਿਤ ਨਿਯਮ"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਨਿਯਮ ਸੈੱਟ ਕਰੋ"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"ਕੁਝ ਵਿਸ਼ੇਸ਼ ਸਮਿਆਂ \'ਤੇ ਧੁਨੀ ਅਤੇ ਥਰਥਰਾਹਟਾਂ ਸੀਮਤ ਕਰੋ"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"ਸਿਰਫ਼ ਤਾਰਾਬੱਧ ਸੰਪਰਕਾਂ ਤੋਂ"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"ਕੋਈ ਨਹੀਂ"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"ਅਲਾਰਮ"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"ਅਲਾਰਮ ਸਦਾ ਤਰਜੀਹ ਰੱਖਦੇ ਹਨ ਅਤੇ ਧੁਨੀ ਵਜਾਉਂਦੇ ਹਨ"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"ਯਾਦ-ਸੂਚਨਾਵਾਂ"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ਇਵੈਂਟ"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"ਸਾਰੇ ਕਾਲਰ"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"ਚੁਣੇ ਗਏ ਕਾਲਰ"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"ਦੁਬਾਰਾ ਕਾਲ ਕਰਨ ਵਾਲੇ"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"ਜੇਕਰ ਇੱਕੋ ਵਿਅਕਤੀ <xliff:g id="MINUTES">%d</xliff:g> ਮਿੰਟ ਦੇ ਅੰਦਰ ਦੂਜੀ ਵਾਰ ਕਾਲ ਕਰਦਾ ਹੈ, ਤਾਂ ਉਸਨੂੰ ਆਗਿਆ ਦਿਓ"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"ਜੇਕਰ ਇੱਕੋ ਵਿਅਕਤੀ <xliff:g id="MINUTES">%d</xliff:g> ਮਿੰਟ ਵਿੱਚ ਦੂਜੀ ਵਾਰ ਕਾਲ ਕਰੇ"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"ਆਟੋਮੈਟਿਕਲੀ ਚਾਲੂ ਕਰੋ"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"ਕਦੇ ਵੀ ਨਹੀਂ"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"ਹਰੇਕ ਰਾਤ ਨੂੰ"</string>
@@ -3304,8 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰ ਸਕਦਾ ਹੈ"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰੋ"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"ਐਪ ਨੂੰ ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਸੋਧਣ ਦਿਓ"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"ਇਹ ਇਜਾਜ਼ਤ ਇੱਕ ਐਪ ਨੂੰ ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਲਈ ਆਗਿਆ ਦਿੰਦੀ ਹੈ।"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"ਹਾਂ"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"ਨਹੀਂ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 1c1ce02..4db0297 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -2790,6 +2790,7 @@
       <item quantity="other">Pokaż %d ukrytego elementu</item>
       <item quantity="one">Pokaż %d ukryty element</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Zwiń"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Sieć i internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"sieć komórkowa"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"użycie danych"</string>
@@ -2894,8 +2895,14 @@
       <item quantity="other">Włączone <xliff:g id="ON_COUNT">%d</xliff:g> automatycznej reguły</item>
       <item quantity="one">Włączona 1 automatyczna reguła</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Ustawienia Nie przeszkadzać"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Tylko priorytetowe"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Nie przeszkadzać"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Działanie"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Zezwól na dźwięki i wibracje z"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Brak dźwięku"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Brak dźwięku (całkowita cisza)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Brak dźwięku oprócz: <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatyczne reguły"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Ustaw reguły Nie przeszkadzać"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Ogranicz dźwięki i wibracje o pewnych porach"</string>
@@ -3079,13 +3086,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Tylko od kontaktów z gwiazdką"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Żadne"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmy"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarmy mają zawsze priorytet i są sygnalizowane dźwiękiem"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Przypomnienia"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Wydarzenia"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Wszyscy rozmówcy"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Wybrani rozmówcy"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Dzwoniący powtórnie"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Zezwalaj na połączenie, jeśli ta sama osoba dzwoni po raz drugi w ciągu <xliff:g id="MINUTES">%d</xliff:g> minut"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Jeśli ta sama osoba dzwoni po raz drugi w ciągu <xliff:g id="MINUTES">%d</xliff:g> min"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Włącz automatycznie"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nigdy"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Każdej nocy"</string>
@@ -3384,8 +3392,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Mogą modyfikować ustawienia systemu"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Modyfikowanie ustawień systemu"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Uprawnienie aplikacji do modyfikowania ust. systemu"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Zezwól na modyfikowanie ustawień systemowych"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"To uprawnienie umożliwia aplikacji modyfikowanie ustawień systemu."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Tak"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nie"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index c8caab3..3659ad8 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -2764,6 +2764,7 @@
       <item quantity="other">Afișați %d de elemente ascunse</item>
       <item quantity="one">Afișați %d element ascuns</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Restrângeți"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Rețea și internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"rețeaua mobilă"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"utilizarea datelor"</string>
@@ -2867,8 +2868,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> de reguli automate activate</item>
       <item quantity="one">1 regulă automată activată</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Preferințe pentru Nu deranja"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"„Numai cu prioritate” permite"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Nu deranja"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Comportament"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Permiteți sunete și vibrații de la"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Fără sunet"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Fără sunet (Niciun sunet)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Fără sunet, cu excepția <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Reguli automate"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Setați regulile pentru Nu deranja"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limitați sunetele și vibrațiile uneori"</string>
@@ -3048,13 +3055,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Doar de la persoanele de contact cu stea"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Niciunul"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarme"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarmele sunt mereu prioritare și emit sunete"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Mementouri"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Evenimente"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Toți apelanții"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Apelanți selectați"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Apelanți care revin"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Dacă aceeași persoană apelează a doua oară într-un interval de <xliff:g id="MINUTES">%d</xliff:g> minute, permite apelul"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Dacă aceeași persoană apelează a doua oară într-un interval de <xliff:g id="MINUTES">%d</xliff:g> minute"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Activați automat"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Niciodată"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"În fiecare seară"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index d5d74aa..c4652b1 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -2790,6 +2790,7 @@
       <item quantity="many">Показать %d скрытых объектов</item>
       <item quantity="other">Показать %d скрытых объекта</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Свернуть"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Сеть и Интернет"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"моб. сети"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"передача данных"</string>
@@ -2894,8 +2895,14 @@
       <item quantity="many"><xliff:g id="ON_COUNT">%d</xliff:g> правил включено</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> правила включено</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Настройки режима \"Не беспокоить\""</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Только важные"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Не беспокоить"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Действия"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Вкл. звуки и вибросигналы из"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Без звука"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Полная тишина"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Без звука, кроме: <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Правила"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Правила режима \"Не беспокоить\""</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Ограничить уведомления"</string>
@@ -3079,13 +3086,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Только от помеченных контактов"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ни от кого"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Будильник"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Будильник всегда важен и подает звуковой сигнал"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Напоминания"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Мероприятия"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Все абоненты"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Выбранные абоненты"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Повторные вызовы"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Уведомить о вызове, если абонент звонит повторно в течение <xliff:g id="MINUTES">%d</xliff:g> мин."</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Если абонент звонит повторно в течение <xliff:g id="MINUTES">%d</xliff:g> мин."</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Включать автоматически"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Никогда"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Каждый вечер"</string>
@@ -3384,8 +3392,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Могут изменять системные настройки"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Изменить системные настройки"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Разрешение на изменение системных настроек"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Разрешить изменение системных настроек"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Приложение сможет изменять системные настройки."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Да"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Нет"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 1001673..243ee45 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="one">සඟවන ලද අයිතම %dක් පෙන්වන්න</item>
       <item quantity="other">සඟවන ලද අයිතම %dක් පෙන්වන්න</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"හකුළන්න"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"ජාලය සහ අන්තර්ජාලය"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"ජංගම"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"දත්ත භාවිතය"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="one">ස්වයංක්‍රිය රීති <xliff:g id="ON_COUNT">%d</xliff:g>ක් සක්‍රියයි</item>
       <item quantity="other">ස්වයංක්‍රිය රීති <xliff:g id="ON_COUNT">%d</xliff:g>ක් සක්‍රියයි</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"මනාපවලට බාධා ‍නොකරන්න"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ප්‍රමුඛතා පමණි ඉඩ දෙයි"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"බාධා නොකරන්න"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"හැසිරීම"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"ශබ්ද සහ කම්පනවලට ඉඩ දෙන්න"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"ශබ්ද නැත"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"ශබ්ද නැත (සම්පූර්ණ නිහඬතාව)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g> හැර ශබ්ද නැත"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"ස්වයංක්‍රීය රීති"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"බාධා නොකරන්න රීති සැකසීම"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"ශබ්ද සහ කම්පන ඇතැම් වේලා වල සීමා කරන්න"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"තරු ලකුණු කළ සම්බන්ධතා වෙතින් පමණි"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"කිසිවක් නැත"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"ඇඟවීම්"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"සීනු සැමවිටම ප්‍රමුඛ වන අතර ශබ්ද ඇති කරයි"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"සිහිකැඳවීම්"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"සිදුවීම්"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"සියලු අමතන්නන්"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"තෝරාගත් අමතන්නන්"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"නැවත අමතන්නන්"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"එකම පුද්ගලයා විනාඩි <xliff:g id="MINUTES">%d</xliff:g> කාල සීමාවක් තුළ දෙවන වතාවටත් අමතයි නම්, එයට අවසර දෙන්න"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"එකම පුද්ගලයා විනාඩි <xliff:g id="MINUTES">%d</xliff:g>ක කාල සීමාවක් තුළ දෙවන වතාවටත් අමතයි නම්"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"ස්වයන්ක්‍රියව සක්‍රිය කරන්න"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"කවදාවත් නෑ"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"සෑම රාත්‍රියකම"</string>
@@ -3304,8 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"පද්ධති සැකසීම් විකරණය කළ හැකිය"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"පද්ධති සැකසීම් විකරණය කරන්න"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"යෙදුම් පද්ධති සැකසීම් විකරණය කිරීමේ අවසරය"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"පද්ධති සැකසීම් වෙනස් කිරීමට ඉඩ දෙන්න"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"මෙම අවසරය යෙදුමකට පද්ධති සැකසීම් විකරණය කිරීමට ඉඩ දෙයි."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"ඔව්"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"නැත"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 9b61d1b..4470dc2 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -2790,6 +2790,7 @@
       <item quantity="other">Zobraziť %d skrytých položiek</item>
       <item quantity="one">Zobraziť %d skrytú položku</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Zbaliť"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Sieť a internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobilné"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"spotreba dát"</string>
@@ -2894,8 +2895,14 @@
       <item quantity="other">Je zapnutých <xliff:g id="ON_COUNT">%d</xliff:g> automatických pravidiel</item>
       <item quantity="one">Je zapnuté 1 automatické pravidlo</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Nastavenia režimu Nerušiť"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioritné"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Nerušiť"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Správanie"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Povoliť zvuky a vibrácie z:"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Bez zvuku"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Žiadne zvuky (Úplné ticho)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Žiadne zvuky okrem <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatické pravidlá"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Nastavenie pravidiel Nerušiť"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"V určitých časoch obmedziť zvuky a vibrovanie"</string>
@@ -3079,13 +3086,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Iba od kontaktov s hviezdičkou"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Žiadne"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Budíky"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Budíky sú vždy prioritné a vydávajú zvuk"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Pripomenutia"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Udalosti"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Všetci volajúci"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Vybraní volajúci"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Opakované volania"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Ak tá istá osoba zavolá druhýkrát do <xliff:g id="MINUTES">%d</xliff:g> min, povoliť hovor"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Ak tá istá osoba zavolá druhýkrát do <xliff:g id="MINUTES">%d</xliff:g> min"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Zapínať automaticky"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nikdy"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Každú noc"</string>
@@ -3384,8 +3392,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Môže upravovať nastavenia systému"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Úprava nastavení systému"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Povolenie pre aplikáciu na úpravy nastavení systému"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Povoliť úpravy nastavení systému"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Toto povolenie umožňuje aplikácii upravovať nastavenia systému."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Áno"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nie"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 037cf6c..419625c 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -2790,6 +2790,7 @@
       <item quantity="few">Pokaži %d skrite elemente</item>
       <item quantity="other">Pokaži %d skritih elementov</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Strni"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Omrežje in internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobilno"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"prenesena količina podatkov"</string>
@@ -2894,8 +2895,14 @@
       <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> samodejna pravila so vklopljena</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> samodejnih pravil je vklopljenih</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Nastavitve načina »ne moti«"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"»Samo prednostno« dovoljuje"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Ne moti"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Vedenje"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Dovoli te zvoke in vibriranja:"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Brez zvoka"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Brez zvoka (Popolna tišina)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Brez zvoka razen: <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Samodejna pravila"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Nastavi pravila za »ne moti«"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Omeji zvoke in vibriranja od določenih urah"</string>
@@ -3079,13 +3086,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Samo od stikov, označenih z zvezdico"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Nič"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmi"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarmi so vedno prednostni in predvajajo zvok"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Opomniki"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Dogodki"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Vsi klicatelji"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Izbrani klicatelji"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Klicatelji, ki večkrat kličejo"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Dovoljeno, če ista oseba kliče že drugič v <xliff:g id="MINUTES">%d</xliff:g> min."</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Če ista oseba kliče že drugič v <xliff:g id="MINUTES">%d</xliff:g> min."</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Samodejni vklop"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nikoli"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Vsako noč"</string>
@@ -3384,8 +3392,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Lahko spreminjajo sistemske nastavitve"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Spreminjanje sist. nastavitev"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Dovoljenje aplikacijam za sprem. sistem. nastavitev"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Dovoli spreminjanje sistemskih nastavitev"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"To dovoljenje aplikaciji dovoljuje spreminjanje sistemskih nastavitev."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Da"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ne"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 91e541e..0d6e187 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="other">Shfaq %d artikuj të fshehur</item>
       <item quantity="one">Shfaq %d artikull të fshehur</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Palos"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Rrjeti dhe interneti"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"celular"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"përdorimi i të dhënave"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> rregulla automatike të aktivizuara</item>
       <item quantity="one">1 rregull automatik i aktivizuar</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Preferencat për \"Mos shqetëso\""</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Vetëm njoftimet me prioritet"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Mos shqetëso"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Sjellja"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Lejo tingujt dhe dridhjet nga"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Asnjë tingull"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Asnjë tingull (Heshtje e plotë)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Asnjë tingull përveç <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Rregullat automatike"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Cakto rregullat për \"Mos shqetëso\""</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Kufizo tingujt dhe dridhjet në kohë të caktuara"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Vetëm nga kontaktet me yll"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Asnjë"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmet"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarmet janë gjithmonë me prioritet dhe lëshojnë tingull"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Alarmet rikujtuese"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Ngjarjet"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Të gjithë telefonuesit"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Telefonuesit e zgjedhur"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Telefonuesit e përsëritur"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Nëse telefonon i njëjti person për herë të dytë në një periudhë prej <xliff:g id="MINUTES">%d</xliff:g> minutash, lejoje"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Nëse telefonon i njëjti person për herë të dytë në një periudhë prej <xliff:g id="MINUTES">%d</xliff:g> minutash, lejoje"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Aktivizo automatikisht"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Asnjëherë!"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Çdo natë"</string>
@@ -3304,8 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Mund të modifikojë cilësimet e sistemit"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Modifiko cilësimet e sistemit"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Leje për aplikacionin që të modifikojë cilësimet e sistemit"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Lejo modifikimin e cilësimeve të sistemit"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Kjo leje e lejon një aplikacion të modifikojë cilësimet e sistemit."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Po"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Jo"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index b5489ba..69adde3 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -2764,6 +2764,7 @@
       <item quantity="few">Прикажи %d скривене ставке</item>
       <item quantity="other">Прикажи %d скривених ставки</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Скупи"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Мрежа и интернет"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"мобилна мрежа"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"потрошња података"</string>
@@ -2867,8 +2868,14 @@
       <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> аутоматска правила су укључена</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> аутоматских правила је укључено</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Подешавања за Не узнемиравај"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Дозвољени су само приоритети"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Не узнемиравај"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Понашање"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Дозволи звуке и вибрације од:"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Без звука"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Без звука (потпуна тишина)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Без звука осим за: <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Аутоматска правила"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Подесите правила за режим „Не узнемиравај“"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Ограничи звукове и вибрације у одређеним интервалима"</string>
@@ -3048,13 +3055,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Само од контаката са звездицом"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ни од кога"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Аларми"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Аларми су увек приоритет и емитује се звук"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Подсетници"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Догађаји"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Сви позиваоци"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Изабрани позиваоци"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Поновни позиваоци"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Ако иста особа позове по други пут у року од <xliff:g id="MINUTES">%d</xliff:g> мин, дозволи позив"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Ако иста особа позове по други пут у периоду од <xliff:g id="MINUTES">%d</xliff:g> мин"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Аутоматски укључи"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Никад"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Сваке вечери"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 3aaf202..16f05da 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -1822,7 +1822,7 @@
     <string name="experimental_category_title" msgid="5272318666666893547">"Ya majaribio"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
     <string name="talkback_summary" msgid="8331244650729024963">"Kisoma skrini hasa kwa watu wenye upofu na wenye matatizo ya kuona"</string>
-    <string name="select_to_speak_summary" msgid="4282846695497544515">"Gonga vipengee kwenye skrini yako ili usikie vikisoma kwa sauti"</string>
+    <string name="select_to_speak_summary" msgid="4282846695497544515">"Gusa vipengee kwenye skrini yako ili usikie vikisoma kwa sauti"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Manukuu"</string>
     <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"Ukuzaji"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Kuza kwa kugonga mara tatu"</string>
@@ -1832,7 +1832,7 @@
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Gonga mara 3 ili ukuze"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Gonga kitufe ili ukuze"</string>
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Ili kukuza"</b>", gonga skrini mara 3 haraka.\n"<ul><li>"Buruta vidole 2 au zaidi ili usogeze"</li>\n<li>"Bana vidole 2 au zaidi ili ubadilishe ukuzaji"</li></ul>\n\n<b>"Ili kukuza kwa muda mfupi"</b>", gonga skrini mara 3 kwa haraka na ukifika mara ya tatu, usiondoe kidole.\n"<ul><li>"Buruta ili usogeze kwenye skrini"</li>\n<li>"Inua kidole ili uvute mbali"</li></ul>\n\n"Huwezi kukuza ukitumia kibodi au sehemu ya viungo muhimu."</string>
-    <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Ukiwasha kipengele cha ukuzaji, tumia Kitufe cha zana za walio na matatizo ya kuona au kusikia hapo chini ya skrini ili ukuze haraka.\n\n"<b>"Ili kukuza"</b>", gonga Kitufe cha zana za walio na matatizo ya kuona au kusikia, kisha ugonge mahali popote kwenye skrini.\n"<ul><li>"Buruta kwa kutumia vidole 2 au zaidi ili usogeze"</li>\n<li>"Bana vidole 2 au zaidi ili ubadilishe ukuzaji"</li></ul>\n\n<b>"Ili kukuza kwa muda mfupi"</b>", gonga Kitufe cha zana za walio na matatizo ya kuona au kusikia, kisha uguse na ushikilie mahali popote kwenye skrini.\n"<ul><li>"Buruta ili usogeze kwenye skrini"</li>\n<li>"Inua kidole ili usogeze mbali"</li></ul>\n\n"Huwezi kuvuta karibu kwenye kibodi au sehemu ya viungo muhimu."</string>
+    <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Ukiwasha kipengele cha ukuzaji, tumia Kitufe cha zana za walio na matatizo ya kuona au kusikia hapo chini ya skrini ili ukuze haraka.\n\n"<b>"Ili kukuza"</b>", gusa Kitufe cha zana za walio na matatizo ya kuona au kusikia, kisha ugonge mahali popote kwenye skrini.\n"<ul><li>"Buruta kwa kutumia vidole 2 au zaidi ili usogeze"</li>\n<li>"Bana vidole 2 au zaidi ili ubadilishe ukuzaji"</li></ul>\n\n<b>"Ili kukuza kwa muda mfupi"</b>", gusa Kitufe cha zana za walio na matatizo ya kuona au kusikia, kisha uguse na ushikilie mahali popote kwenye skrini.\n"<ul><li>"Buruta ili usogeze kwenye skrini"</li>\n<li>"Inua kidole ili usogeze mbali"</li></ul>\n\n"Huwezi kuvuta karibu kwenye kibodi au sehemu ya viungo muhimu."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Kitufe cha zana za walio na matatizo ya kuona au kusikia kimewekwa kuwa <xliff:g id="SERVICE">%1$s</xliff:g>. Gusa na ushikilie Kitufe cha zana za walio na matatizo ya kuona au kusikia, kisha uchague ukuzaji ili utumie kipengele cha ukuzaji."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Njia ya mkato ya kitufe cha sauti"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Huduma ya njia ya mkato"</string>
@@ -2636,14 +2636,14 @@
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"Tumia chaguo-msingi"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"Kila wakati"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"Isipokuwa wakati programu nyingine ya malipo imefunguliwa"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Unapolipa ukitumia chaguo la Gonga na ulipe, tumia:"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Unapolipa ukitumia chaguo la Gusisha ili ulipe, tumia:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"Kulipa katika kituo"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Sanidi programu ya malipo. Shikilia tu upande wa nyuma wa simu yako kwenye kituo chochote cha malipo chenye alama ya kulipa bila kugusa."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"Nimeelewa"</string>
     <string name="nfc_more_title" msgid="815910943655133280">"Zaidi..."</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Ungependa kuweka kama mapendeleo yako?"</string>
-    <string name="nfc_payment_set_default" msgid="8532426406310833489">"Ungependa kutumia <xliff:g id="APP">%1$s</xliff:g> unapotumia Gonga na ulipe?"</string>
-    <string name="nfc_payment_set_default_instead_of" msgid="6993301165940432743">"Ungependa kutumia <xliff:g id="APP_0">%1$s</xliff:g> badala ya <xliff:g id="APP_1">%2$s</xliff:g> unapotumia Gonga na ulipe?"</string>
+    <string name="nfc_payment_set_default" msgid="8532426406310833489">"Ungependa kutumia <xliff:g id="APP">%1$s</xliff:g> unapogusisha ili ulipe?"</string>
+    <string name="nfc_payment_set_default_instead_of" msgid="6993301165940432743">"Ungependa kutumia <xliff:g id="APP_0">%1$s</xliff:g> badala ya <xliff:g id="APP_1">%2$s</xliff:g> unapotumia chaguo la kugusisha ili ulipe?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Vikwazo"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Ondoa vikwazo"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Badilisha PIN"</string>
@@ -2738,6 +2738,7 @@
       <item quantity="other">Onyesha vipengee %d vilivyofichwa</item>
       <item quantity="one">Onyesha kipengee %d kilichofichwa</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Kunja"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Mtandao na Intaneti"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"kifaa cha mkononi"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"matumizi ya data"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="other">Imewasha sheria <xliff:g id="ON_COUNT">%d</xliff:g> za kiotomatiki</item>
       <item quantity="one">Imewasha sheria 1 ya kiotomatiki</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Mapendeleo ya hali ya Usinisumbue"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Yanayopewa kipaumbele ni"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Usisumbue"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Tabia"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Ruhusu sauti na mitetemo kutoka"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Hakuna sauti"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Hakuna sauti (Kimya Kabisa)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Hakuna sauti ila <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Sheria otomatiki"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Weka sheria za Usinisumbue"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Dhibiti sauti na mitetemo wakati fulani"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Kutoka kwa anwani zenye nyota pekee"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Hamna"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Kengele"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Kengele hupewa kipaumbele na hutoa sauti"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Vikumbusho"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Matukio"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Wapiga simu wote"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Wale uliowachagua"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Wanaorudia kupiga simu"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Mtu yule yule akipiga simu mara ya pili ndani ya kipindi cha dakika <xliff:g id="MINUTES">%d</xliff:g>, mruhusu"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Mtu yule yule akipiga simu mara ya pili katika kipindi cha dakika <xliff:g id="MINUTES">%d</xliff:g>"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Washa kiotomatiki"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Katu"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Kila usiku"</string>
@@ -3304,8 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Inaweza kubadilisha mipangilio ya mfumo"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Badilisha mipangilio ya mfumo"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Ruhusa ya programu ya kubadilisha mipangilio ya mfumo"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Ruhusu ubadilishaji wa mipangilio ya mfumo"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Idhini hii huruhusu programu kubadilisha mipangilio ya mfumo"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ndiyo"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Hapana"</string>
@@ -3585,7 +3592,7 @@
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Gonga mara mbili ili uangalie simu"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Gonga mara mbili ili uangalie kompyuta kibao"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Gonga mara mbili ili uangalie kifaa"</string>
-    <string name="ambient_display_summary" msgid="525662960806416373">"Ili uangalie saa, aikoni za arifa na maelezo mengine, gonga skrini yako mara mbili."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Ili uangalie saa, aikoni za arifa na maelezo mengine, gusa skrini yako mara mbili."</string>
     <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Angalia arifa wakati skrini imezimwa"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Inua ili uangalie simu"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Inua ili uangalie kompyuta kibao"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 6b69626..7a40f5a 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="other">மறைந்துள்ள %d உருப்படிகளைக் காட்டு</item>
       <item quantity="one">மறைந்துள்ள %d உருப்படியைக் காட்டு</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"சுருக்கும்"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"நெட்வொர்க் &amp; இன்டர்நெட்"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"மொபைல்"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"டேட்டா பயன்பாடு"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> தானியங்கு விதிகள் இயக்கப்பட்டன</item>
       <item quantity="one">1 தானியங்கு விதி இயக்கப்பட்டது</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"\'தொந்தரவு செய்யாதே\' விருப்பத்தேர்வுகள்"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"அனுமதிக்கப்படுபவை:"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"தொந்தரவு செய்யாதே"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"செயல்பாடு"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"இந்த ஒலிகள்/அதிர்வுகளை அனுமதி"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"ஒலியெழுப்ப வேண்டாம்"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"ஒலியெழுப்ப வேண்டாம் (அமைதி)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g> தவிர்த்து ஒலியெழுப்ப வேண்டாம்"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"தானியங்கு விதிகள்"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"டிஎன்டி விதிகளை அமை"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"ஒலி &amp; அதிர்வுகளை வரம்பிடு"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"நட்சத்திரமிட்ட தொடர்புகளிலிருந்து மட்டுமே"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"ஏதுமில்லை"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"அலாரங்கள்"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"அலாரங்கள் எப்போதும் முதன்மையானவை, ஒலியை எழுப்பும்"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"நினைவூட்டல்கள்"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"நிகழ்வுகள்"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"எல்லா அழைப்பாளர்களும்"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"தேர்ந்தெடுக்கப்பட்ட அழைப்பாளர்கள்"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"மீண்டும் மீண்டும் அழைப்பவர்கள்"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"<xliff:g id="MINUTES">%d</xliff:g> நிமிடங்களுக்குள் இரண்டாவது முறையாக அதே எண்ணிலிருந்து அழைப்பு வந்தால், அனுமதி"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"<xliff:g id="MINUTES">%d</xliff:g> நிமிடத்திற்குள் இரண்டாவது முறையாக அதே எண்ணிலிருந்து அழைப்பு வந்தால், அனுமதி"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"தானாகவே இயக்கு"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"ஒருபோதும் வேண்டாம்"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"ஒவ்வொரு இரவும்"</string>
@@ -3304,8 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"முறைமை அமைப்புகளை மாற்றலாம்"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"சாதன அமைப்புகளை மாற்று"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"பயன்பாடானது முறைமை அமைப்புகளை மாற்றுவதற்கான அனுமதி"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"சிஸ்டம் அமைப்புகளை மாற்றுவதற்கு அனுமதி"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"இது முறைமை அமைப்புகளை மாற்ற, பயன்பாட்டை அனுமதிக்கும்."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"அனுமதிக்கப்பட்டது"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"அனுமதிக்கப்படவில்லை"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 3e7956d..53a16ff 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="other">%d దాచబడిన అంశాలను చూపుతుంది</item>
       <item quantity="one">%d దాచబడిన అంశాన్ని చూపుతుంది</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"కుదించండి"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"నెట్‌వర్క్ &amp; ఇంటర్నెట్"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"మొబైల్‌"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"డేటా వినియోగం"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> స్వయంచాలక నియమాలు ఆన్ చేయబడ్డాయి</item>
       <item quantity="one">1 స్వయంచాలక నియమం ఆన్ చేయబడింది</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"అంతరాయం కలిగించవద్దు ప్రాధాన్యతలు"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ప్రాధాన్యతగలవే అనుమతించబడతాయి"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"అంతరాయం కలిగించవద్దు"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"ప్రవర్తన"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"దీని నుండి అన్ని ధ్వనులు మరియు వైబ్రేషన్‌లు"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"ధ్వని చేయదు"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"ధ్వని చేయదు (మొత్తం నిశ్శబ్దం)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g> మినహా ధ్వని చేయదు"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"స్వయంచాలక నిబంధనలు"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"అంతరాయం కలిగించవద్దు నియమాలు సెట్ చేయి"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"నిర్దిష్ట సమయాలలో ధ్వనులు, వైబ్రేషన్‌లను పరిమితంగా ఉంచుతుంది"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"నక్షత్రం గల పరిచయాల నుండి మాత్రమే"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"ఏవీ వద్దు"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"అలారాలు"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"అలారాలు ఎల్లప్పుడూ ప్రాధాన్యంగా పరిగణించబడి, శబ్దం చేస్తాయి"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"రిమైండర్‌లు"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ఈవెంట్‌లు"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"అందరు కాలర్‌లు"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"ఎంచుకున్న కాలర్‌లు"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"పునరావృత కాలర్‌లను అనుమతించు"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"ఒకే వ్యక్తి <xliff:g id="MINUTES">%d</xliff:g> నిమిషం వ్యవధిలో రెండవసారి కాల్ చేస్తే, దాన్ని అనుమతిస్తుంది"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"<xliff:g id="MINUTES">%d</xliff:g> నిమిషం వ్యవధిలో అదే వ్యక్తి రెండో సారి కాల్ చేస్తే"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"స్వయంచాలకంగా ఆన్ చేయి"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"ఎప్పటికీ వద్దు"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"ప్రతి రాత్రి"</string>
@@ -3305,8 +3313,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"సిస్టమ్ సెట్టింగ్‌లు సవరించగలవు"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"సిస్టమ్ సెట్టింగ్‌ల సవరణ"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"యాప్ సిస్టమ్ సెట్టింగ్‌లను సవరించడానికి అనుమతి"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"సిస్టమ్ సెట్టింగ్‌ల సవరణను అనుమతించండి"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"ఈ అనుమతి సిస్టమ్ సెట్టింగ్‌లను సవరించడానికి అనువర్తనాన్ని అనుమతిస్తుంది."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"అవును"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"లేదు"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index f1aa0fc..e65e232 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="other">แสดงรายการที่ซ่อน %d รายการ</item>
       <item quantity="one">แสดงรายการที่ซ่อน %d รายการ</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"ยุบ"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"เครือข่ายและอินเทอร์เน็ต"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"มือถือ"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ปริมาณการใช้อินเทอร์เน็ต"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="other">เปิดกฎอัตโนมัติแล้ว <xliff:g id="ON_COUNT">%d</xliff:g> รายการ</item>
       <item quantity="one">เปิดกฎอัตโนมัติแล้ว 1 รายการ</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"ค่ากำหนดของ \"ห้ามรบกวน\""</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"อนุญาตเฉพาะเรื่องสำคัญ"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"ห้ามรบกวน"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"ลักษณะการทำงาน"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"อนุญาตให้มีเสียงและการสั่นจาก"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"ไม่มีเสียง"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"ไม่มีเสียง (ปิดเสียงทั้งหมด)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"ไม่มีเสียง ยกเว้น<xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"กฎอัตโนมัติ"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"ตั้งกฎห้ามรบกวน"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"จำกัดเสียงและการสั่นในบางเวลา"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"จากรายชื่อติดต่อที่ติดดาวเท่านั้น"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"ไม่มี"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"การปลุก"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"เสียงปลุกจะเป็นการแจ้งเตือนที่สำคัญและส่งเสียงเสมอ"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"การช่วยเตือน"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"กิจกรรม"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"ผู้โทรทั้งหมด"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"ผู้โทรที่เลือกไว้"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"ผู้โทรซ้ำ"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"อนุญาตถ้าผู้โทรคนเดิมโทรเป็นครั้งที่ 2 ภายใน <xliff:g id="MINUTES">%d</xliff:g> นาที"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"ถ้าผู้โทรคนเดิมโทรเป็นครั้งที่ 2 ภายใน <xliff:g id="MINUTES">%d</xliff:g> นาที"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"เปิดโดยอัตโนมัติ"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"ไม่ใช้"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"ทุกคืน"</string>
@@ -3304,8 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"สามารถแก้ไขการตั้งค่าระบบได้"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"แก้ไขการตั้งค่าระบบ"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"สิทธิ์ของแอปในการแก้ไขการตั้งค่าระบบ"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"อนุญาตให้แก้ไขการตั้งค่าระบบ"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"สิทธิ์นี้อนุญาตให้แอปแก้ไขการตั้งค่าระบบได้"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"ใช่"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"ไม่"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index f4fc54c..a39e2fd 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="one">Ipakita ang %d nakatagong item</item>
       <item quantity="other">Ipakita ang %d na nakatagong item</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"I-collapse"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Network at Internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobile"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"paggamit ng data"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="one">May <xliff:g id="ON_COUNT">%d</xliff:g> awtomatikong panuntunang naka-on</item>
       <item quantity="other">May <xliff:g id="ON_COUNT">%d</xliff:g> na awtomatikong panuntunang naka-on</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Mga kagustuhan sa Huwag Istorbohin"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Pinapayagan lang ng prioridad"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Huwag Istorbohin"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Gawi"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Payagan ang mga tunog at pag-vibrate mula sa"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Walang tunog"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Walang tunog (Ganap na Katahimikan)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Walang tunog maliban sa <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Mga awtomatikong panuntunan"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Magtakda ng panuntunan ng Huwag Istorbohin"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limitahan ang tunog at pag-vibrate sa partikular na oras"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Mula sa mga contact na may star lang"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Wala"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Mga Alarm"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Palaging may priyoridad at tumutunog ang mga alarm"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Mga Paalala"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Mga Kaganapan"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Lahat ng tumatawag"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Mga napiling tumatawag"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Mga umulit na tumatawag"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Kung tumawag ang iisang tao sa pangalawang pagkakataon sa loob ng <xliff:g id="MINUTES">%d</xliff:g> (na) minuto, payagan ito"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Kung muling tumawag ang isang tao sa loob ng <xliff:g id="MINUTES">%d</xliff:g> (na) minuto"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Awtomatikong i-on"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Hindi Kailanman"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Bawat gabi"</string>
@@ -3304,8 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Maaaring magbago ng mga setting ng system"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Baguhin ang setting ng system"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Pahintulot sa pagbago ng app sa setting ng system"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Payagan ang pagbago sa mga setting ng system"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Nagbibigay-daan ang pahintulot na ito sa isang app na baguhin ang mga setting ng system."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Oo"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Hindi"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index fd959a1..a33be49 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="other">Gizli %d öğeyi göster</item>
       <item quantity="one">Gizli %d öğeyi göster</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Daralt"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Ağ ve İnternet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobil"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"veri kullanımı"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> otomatik kural açıldı</item>
       <item quantity="one">1 otomatik kural açıldı</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Rahatsız Etmeyin tercihleri"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Öncelikli olanlar"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Rahatsız Etmeyin"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Davranış"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Şu seslere ve titreşimlere izin ver:"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Sessiz"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Hiç ses yok (Tamamen Sessiz)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g> dışında ses yok"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Otomatik kurallar"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Rahatsız Etmeyin kurallarını ayarla"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Belirli zamanlarda sesleri ve titreşimleri sınırlandır"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Yalnızca yıldızlı kişilerden"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Hiçbiri"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmlar"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarmlar her zaman öncelikli ve sesli"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Hatırlatıcılar"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Etkinlikler"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Tüm arayanlar"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Seçili arayanlar"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Tekrar arayanlar"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Aynı kişi <xliff:g id="MINUTES">%d</xliff:g> dakika içinde ikinci defa ararsa izin ver"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Aynı kişi <xliff:g id="MINUTES">%d</xliff:g> dakika içinde ikinci defa ararsa"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Otomatik olarak aç"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Hiçbir zaman"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Her gece"</string>
@@ -3304,8 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Sistem ayarlarını değiştirebilir"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Sistem ayarlarını değiştir"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Uygulamanın, sistem ayarlarını değiştirme izni"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Sistem ayarlarının değiştirilmesine izin ver"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Bu izin, bir uygulanın sistem ayarlarını değiştirmesine olanak sağlar."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Evet"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Hayır"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 477777d..38bc1b1 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -2790,6 +2790,7 @@
       <item quantity="many">Показати %d схованих елементів</item>
       <item quantity="other">Показати %d схованого елемента</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Згорнути"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Мережа й Інтернет"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"мобільна мережа"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"використання трафіку"</string>
@@ -2894,8 +2895,14 @@
       <item quantity="many">Увімкнено <xliff:g id="ON_COUNT">%d</xliff:g> автоматичних правил</item>
       <item quantity="other">Увімкнено <xliff:g id="ON_COUNT">%d</xliff:g> автоматичного правила</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Режим \"Не турбувати\""</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Дозволити лише пріоритетні"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Не турбувати"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Поведінка"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Дозволити звуки й вібросигнали:"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Без звуку"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Без звуку (сигнали вимкнено)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Без звуку, винятки: <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Авторежим"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Налаштувати правила режиму \"Не турбувати\""</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Обмежувати звуки й вібросигнали в певний час"</string>
@@ -3079,13 +3086,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Лише від позначених контактів"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ні від кого"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Будильник"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Будильник завжди важливий і подає звуковий сигнал"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Нагадування"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Події"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Усі абоненти"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Вибрані абоненти"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Повторні вхідні виклики"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Дозволити звуковий сигнал, якщо та сама особа телефонує знову через <xliff:g id="MINUTES">%d</xliff:g> хв"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Якщо та сама людина телефонує вдруге протягом <xliff:g id="MINUTES">%d</xliff:g> хв"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Вмикати автоматично"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"ніколи"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"щовечора"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 178f2fa..478b61a 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -2736,6 +2736,7 @@
     <string name="dashboard_title" msgid="5453710313046681820">"ترتیبات"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for settings_suggestion_header_summary_hidden_items (5597356221942118048) -->
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"سکیڑیں"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"نیٹ ورک اور انٹرنیٹ"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"موبائل"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ڈیٹا کا استعمال"</string>
@@ -2838,8 +2839,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> خود کار اصول آن ہیں</item>
       <item quantity="one">1 خود کار اصول آن ہے</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"ڈسٹرب نہ کریں کی ترجیحات"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"صرف ترجیحی اجازتیں"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"ڈسٹرب نہ کریں"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"برتاؤ"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"اس سے آوازیں اور وائبریشنز کی اجازت دیں"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"کوئی آواز نہیں ہے"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"کوئی آواز نہیں ہے (مکمل خاموشی)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g> کے سوا کوئی آواز نہیں ہے"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"خودکار اصول"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"\'ڈسٹرب نہ کریں\' اصول سیٹ کریں"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"مخصوص اوقات پر آوازیں اور وائبریشنز کو محدود کریں"</string>
@@ -3015,13 +3022,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"صرف ستارہ کے نشان والے رابطوں سے"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"کوئی نہیں"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"الارمز"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"الارمز ہمیشہ ترجیحی ہوتے ہیں اور آواز کرتے ہیں"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"یاد دہانیاں"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ایونٹس"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"تمام کال کرنے والے"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"منتخب کردہ کالرز"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"بار بار کال کرنے والے"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"اگر ایک ہی شخص <xliff:g id="MINUTES">%d</xliff:g> منٹ کے اندر دوسری بار کال کرتا ہے تو اس کی اجازت دیں"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"ایک ہی شخص کے <xliff:g id="MINUTES">%d</xliff:g> منٹ کے اندر دوسری بار کال کرنے پر"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"خود کار طور پر آن کریں"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"کبھی نہیں"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"ہر رات"</string>
@@ -3302,8 +3310,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"سسٹم ترتیبات میں ترمیم کر سکتی ہیں"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"سسٹم ترتیبات میں ترمیم کریں"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"ایپ \'سسٹم ترتیبات میں ترمیم کریں\' کی اجازت"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"سسٹم کی ترتیبات میں ترمیم کرنے کی اجازت دیں"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"یہ اجازت ایپ کو سسٹم ترتیبات میں ترمیم کرنے دیتی ہے۔"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"ہاں"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"نہیں"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 5fd3c0c..1ef0005 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -2750,6 +2750,7 @@
       <item quantity="other">%d ta yashirin elementni ko‘rsatish</item>
       <item quantity="one">%d ta yashirin elementni ko‘rsatish</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Yig‘ish"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Tarmoq va Internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobil"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"trafik sarfi"</string>
@@ -2852,8 +2853,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ta avtomatik qoida yoniq</item>
       <item quantity="one">1 ta avtomatik qoida yoniq</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Bezovta qilmaslik parametrlari"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Faqat muhimlari"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Bezovta qilinmasin"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Hatti-xarakatlar"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Ovoz va tebranishlarga ruxsat:"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Ovozsiz"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Ovozsiz (jimjitlik)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Ovozsiz (istisno: <xliff:g id="CATEGORIES">%1$s</xliff:g>)"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Avtomatik qoidalar"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Bezovta qilmaslik qoidalari"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Tovush va tebranishlarni muayyan vaqtga cheklash"</string>
@@ -3029,13 +3036,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Faqat yulduzchali kontaktlardan"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Hech kimdan"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Signallar"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Signallar doim muhim va ovozsiz qilib bo‘lmaydi"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Eslatmalar"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Tadbirlar"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Barcha abonentlar"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Saralangan abonentlar"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Qayta chaqiruvlar"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Agar abonent <xliff:g id="MINUTES">%d</xliff:g> daqiqa ichida qayta qo‘ng‘iroq qilsa, qo‘ng‘iroq haqida xabar qilinsin"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Agar abonent <xliff:g id="MINUTES">%d</xliff:g> daqiqa ichida qayta qo‘ng‘iroq qilsa, qo‘ng‘iroq haqida xabar qilinsin"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Avtomatik yoqish"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Hech qachon"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Har kuni kechasi"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 40fea8b..7c32d82 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -2738,6 +2738,7 @@
       <item quantity="other">Hiển thị %d mục ẩn</item>
       <item quantity="one">Hiển thị %d mục ẩn</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Thu gọn"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Mạng và Internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"thiết bị di động"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"sử dụng dữ liệu"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> quy tắc tự động được bật</item>
       <item quantity="one">1 quy tắc tự động được bật</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Tùy chọn Không làm phiền"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Chỉ cho phép ưu tiên"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Không làm phiền"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Hành vi"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Cho phép âm thanh và rung từ"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Không có âm báo"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Hoàn toàn im lặng"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Không có âm báo ngoại trừ <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Quy tắc tự động"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Đặt quy tắc Không làm phiền"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Hạn chế âm thanh và rung tại một số thời điểm"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Chỉ từ các liên hệ có gắn dấu sao"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Không có"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Báo thức"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Báo thức luôn được ưu tiên và phát ra âm thanh"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Lời nhắc"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Sự kiện"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Tất cả người gọi"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Người gọi được chọn"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Người gọi lặp lại"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Nếu cùng một người gọi hai lần trong vòng <xliff:g id="MINUTES">%d</xliff:g> phút, hãy cho phép cuộc gọi này"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Nếu cùng một người gọi hai lần trong vòng <xliff:g id="MINUTES">%d</xliff:g> phút"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Tự động bật"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Không bao giờ"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Hàng đêm"</string>
@@ -3304,8 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Có thể sửa đổi cài đặt hệ thống"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Sửa đổi cài đặt hệ thống"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Quyền sửa đổi cài đặt hệ thống của ứng dụng"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Cho phép sửa đổi cài đặt hệ thống"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Quyền này cho phép ứng dụng sửa đổi cài đặt hệ thống."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Có"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Không"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index ed9b073..8b367b0 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -2638,7 +2638,7 @@
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"但其他付款应用开启时除外"</string>
     <string name="nfc_payment_pay_with" msgid="7524904024378144072">"通过触碰付款终端进行付款时使用以下应用："</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"通过支付终端付款"</string>
-    <string name="nfc_how_it_works_content" msgid="4749007806393224934">"设置付款应用，然后只需将手机背面触碰任何带有非接触标志的终端即可。"</string>
+    <string name="nfc_how_it_works_content" msgid="4749007806393224934">"设置付款应用，然后只需将手机背面靠近任何带有非接触标志的终端即可。"</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"知道了"</string>
     <string name="nfc_more_title" msgid="815910943655133280">"更多…"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"要设为您的偏好设置吗？"</string>
@@ -2738,6 +2738,7 @@
       <item quantity="other">显示 %d 项隐藏内容</item>
       <item quantity="one">显示 %d 项隐藏内容</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"收起"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"网络和互联网"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"移动网络"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"流量使用"</string>
@@ -2840,8 +2841,14 @@
       <item quantity="other">已启用 <xliff:g id="ON_COUNT">%d</xliff:g> 个自动规则</item>
       <item quantity="one">已启用 1 个自动规则</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"“勿扰”偏好设置"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"仅允许指定的优先事项打扰"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"勿扰模式"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"行为"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"允许以下类型的提示音和振动："</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"不发出提示音"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"不发出提示音（完全阻止）"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"不发出提示音（<xliff:g id="CATEGORIES">%1$s</xliff:g>除外）"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"自动规则"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"设置“勿扰”规则"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"在特定时段限制声音和振动"</string>
@@ -3017,13 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"仅限来自收藏的联系人"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"无"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"闹钟"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"闹钟始终优先，并发出提示音"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"提醒"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"活动"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"所有来电者"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"所选的来电者"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"重复来电者"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"如果同一个人在 <xliff:g id="MINUTES">%d</xliff:g> 分钟内第二次来电，则允许显示通知"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"如果同一个人在 <xliff:g id="MINUTES">%d</xliff:g> 分钟内第二次来电"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"自动开启"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"永不"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"每晚"</string>
@@ -3304,8 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"可修改系统设置"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"修改系统设置"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"允许应用修改系统设置权限"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"允许修改系统设置"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"此权限允许应用修改系统设置。"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"允许"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"不允许"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 33575fc..5b20f66 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -2741,6 +2741,7 @@
       <item quantity="other">顯示 %d 個隱藏項目</item>
       <item quantity="one">顯示 %d 個隱藏項目</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"收合"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"網絡和互聯網"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"流動網絡"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"數據用量"</string>
@@ -2843,8 +2844,14 @@
       <item quantity="other">已開啟 <xliff:g id="ON_COUNT">%d</xliff:g> 個自動規則</item>
       <item quantity="one">已開啟 1 個自動規則</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"請勿騷擾偏好設定"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"優先設定只允許："</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"請勿打擾"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"行為"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"允許發出下列類型的音效和震動"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"不發出音效"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"不發出音效 (完全靜音)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"不發出音效 (<xliff:g id="CATEGORIES">%1$s</xliff:g>除外)"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"自動規則"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"設定請勿騷擾規則"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"在特定時間限制音效和震動"</string>
@@ -3020,13 +3027,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"只限已加星號的聯絡人"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"無"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"鬧鐘"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"鬧鐘永遠可優先發出音效"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"提醒"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"活動"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"所有來電者"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"已選取的來電者"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"重複來電"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"如果同一人在 <xliff:g id="MINUTES">%d</xliff:g> 分鐘內再次來電，則允許"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"如果同一人在 <xliff:g id="MINUTES">%d</xliff:g> 分鐘內第二次來電"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"自動開啟"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"永不"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"每天晚上"</string>
@@ -3307,8 +3315,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"可以修改系統設定"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"修改系統設定"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"應用程式修改系統設定權限"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"允許修改系統設定"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"此權限允許應用程式修改系統設定。"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"允許"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"不允許"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 201fb3a..9ce51aa 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -2742,6 +2742,7 @@
       <item quantity="other">顯示 %d 個隱藏項目</item>
       <item quantity="one">顯示 %d 個隱藏項目</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"收合"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"網路和網際網路"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"行動網路"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"數據用量"</string>
@@ -2844,8 +2845,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> 個自動規則已開啟</item>
       <item quantity="one">1 個自動規則已開啟</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"「零打擾」偏好設定"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"僅允許優先通知"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"零打擾"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"行為"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"只允許下列類型的音效與震動："</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"不發出音效"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"不發出音效 (完全靜音)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"除了<xliff:g id="CATEGORIES">%1$s</xliff:g>以外一律不發出音效"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"自動規則"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"設定「零打擾」規則"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"在特定時間禁用音效和震動"</string>
@@ -3021,13 +3028,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"來自已加星號的聯絡人"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"無"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"鬧鐘"</string>
-    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"鬧鐘一律可優先發出音效"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"提醒"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"活動"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"所有來電者"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"所選來電者"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"重複來電者"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"如果同一個人在 <xliff:g id="MINUTES">%d</xliff:g> 分鐘的時間內第二次來電，即顯示通知"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"如果同一個人在 <xliff:g id="MINUTES">%d</xliff:g> 分鐘的時間內第二次來電"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"自動開啟"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"永遠不要"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"每晚"</string>
@@ -3308,8 +3316,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"可以修改系統設定"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"修改系統設定"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"應用程式修改系統設定權限"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"允許修改系統設定"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"這項權限允許應用程式修改系統設定。"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"可"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"否"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6b0bd6d..b6b860d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6703,7 +6703,7 @@
     <!-- Do not disturb: Subtitle for DND behavior indicating no sound will get past DND due to user and/or API-invoked Total Silence mode. [CHAR LIMIT=40] -->
     <string name="zen_mode_behavior_total_silence">No sound (Total Silence)</string>
 
-    <!-- Do not disturb: Used before specifying which sounds can bypass DND (ie: No sound except alarms and reminders). [CHAR LIMIT=30] -->
+    <!-- Do not disturb: Used before specifying which sounds can bypass DND (ie: No sound except alarms and reminders). [CHAR LIMIT=40] -->
     <string name="zen_mode_behavior_no_sound_except">No sound except <xliff:g id="categories" example="alarms, media and system feedback">%1$s</xliff:g></string>
 
     <!-- Do not disturb: Specifies sounds that can bypass DND in user and/or API-invoked Alarms Only mode.  [CHAR LIMIT=100] -->
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 1da2a25..e60dbe3 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -272,6 +272,11 @@
             android:entries="@array/bluetooth_a2dp_codec_ldac_playback_quality_titles"
             android:entryValues="@array/bluetooth_a2dp_codec_ldac_playback_quality_values" />
 
+        <SwitchPreference
+            android:key="dns_tls"
+            android:title="@string/dns_tls"
+            android:summary="@string/dns_tls_summary" />
+
     </PreferenceCategory>
 
     <PreferenceCategory android:key="debug_input_category"
diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java
index 3e139e1..1ae9711 100644
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -30,10 +30,12 @@
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.TabHost;
 import android.widget.TabHost.OnTabChangeListener;
@@ -333,6 +335,11 @@
         setDialogValues();
 
         mPinDialog.showPinDialog();
+
+        final EditText editText = mPinDialog.getEditText();
+        if (!TextUtils.isEmpty(mPin) && editText != null) {
+            editText.setSelection(mPin.length());
+        }
     }
 
     private void setDialogValues() {
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 287498f..822a60d 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -277,9 +277,9 @@
             root.removeAll();
         }
         if (ProgressiveDisclosureMixin.isV2Enabled()) {
-            addPreferencesFromResource(R.xml.security_settings);
-        } else {
             addPreferencesFromResource(R.xml.security_settings_advanced_button);
+        } else {
+            addPreferencesFromResource(R.xml.security_settings);
         }
         root = getPreferenceScreen();
 
diff --git a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
index 07f4c37..f66a5e2 100644
--- a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
+++ b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
@@ -23,6 +23,7 @@
 import android.app.DialogFragment;
 import android.app.Fragment;
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Binder;
 import android.os.Bundle;
@@ -54,7 +55,8 @@
 
     @Override
     protected List<? extends DefaultAppInfo> getCandidates() {
-        final AccessibilityManager accessibilityManager = getContext()
+        final Context context = getContext();
+        final AccessibilityManager accessibilityManager = context
                 .getSystemService(AccessibilityManager.class);
         final List<AccessibilityServiceInfo> installedServices =
                 accessibilityManager.getInstalledAccessibilityServiceList();
@@ -63,7 +65,7 @@
         List<DefaultAppInfo> candidates = new ArrayList<>(numInstalledServices);
         for (int i = 0; i < numInstalledServices; i++) {
             AccessibilityServiceInfo installedServiceInfo = installedServices.get(i);
-            candidates.add(new DefaultAppInfo(mPm,
+            candidates.add(new DefaultAppInfo(context, mPm,
                     UserHandle.myUserId(),
                     installedServiceInfo.getComponentName(),
                     (String) installedServiceInfo.loadSummary(mPm.getPackageManager()),
diff --git a/src/com/android/settings/applications/assist/DefaultAssistPicker.java b/src/com/android/settings/applications/assist/DefaultAssistPicker.java
index 51cb677..07bc809 100644
--- a/src/com/android/settings/applications/assist/DefaultAssistPicker.java
+++ b/src/com/android/settings/applications/assist/DefaultAssistPicker.java
@@ -79,7 +79,7 @@
                 continue;
             }
             packages.add(packageName);
-            candidates.add(new DefaultAppInfo(mPm, mUserId, info.component));
+            candidates.add(new DefaultAppInfo(getContext(), mPm, mUserId, info.component));
         }
         return candidates;
     }
@@ -88,7 +88,7 @@
     protected String getDefaultKey() {
         final ComponentName cn = getCurrentAssist();
         if (cn != null) {
-            return new DefaultAppInfo(mPm, mUserId, cn).getKey();
+            return new DefaultAppInfo(getContext(), mPm, mUserId, cn).getKey();
         }
         return null;
     }
diff --git a/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java b/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java
index 7520155..cba08c8 100644
--- a/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java
+++ b/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java
@@ -87,7 +87,7 @@
         if (cn == null) {
             return null;
         }
-        return new DefaultAppInfo(mPackageManager, mUserId, cn);
+        return new DefaultAppInfo(mContext, mPackageManager, mUserId, cn);
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/applications/assist/DefaultVoiceInputPicker.java b/src/com/android/settings/applications/assist/DefaultVoiceInputPicker.java
index c1fc528..5adda23 100644
--- a/src/com/android/settings/applications/assist/DefaultVoiceInputPicker.java
+++ b/src/com/android/settings/applications/assist/DefaultVoiceInputPicker.java
@@ -57,17 +57,18 @@
     @Override
     protected List<VoiceInputDefaultAppInfo> getCandidates() {
         final List<VoiceInputDefaultAppInfo> candidates = new ArrayList<>();
+        final Context context = getContext();
         boolean hasEnabled = true;
         for (VoiceInputHelper.InteractionInfo info : mHelper.mAvailableInteractionInfos) {
             final boolean enabled = TextUtils.equals(info.key, mAssistRestrict);
             hasEnabled |= enabled;
-            candidates.add(new VoiceInputDefaultAppInfo(mPm, mUserId, info, enabled));
+            candidates.add(new VoiceInputDefaultAppInfo(context, mPm, mUserId, info, enabled));
         }
 
         final boolean assistIsService = !hasEnabled;
         for (VoiceInputHelper.RecognizerInfo info : mHelper.mAvailableRecognizerInfos) {
             final boolean enabled = !assistIsService;
-            candidates.add(new VoiceInputDefaultAppInfo(mPm, mUserId, info, enabled));
+            candidates.add(new VoiceInputDefaultAppInfo(context, mPm, mUserId, info, enabled));
         }
         return candidates;
     }
@@ -132,9 +133,9 @@
 
         public VoiceInputHelper.BaseInfo mInfo;
 
-        public VoiceInputDefaultAppInfo(PackageManagerWrapper pm, int userId,
+        public VoiceInputDefaultAppInfo(Context context, PackageManagerWrapper pm, int userId,
                 VoiceInputHelper.BaseInfo info, boolean enabled) {
-            super(pm, userId, info.componentName, null /* summary */, enabled);
+            super(context, pm, userId, info.componentName, null /* summary */, enabled);
             mInfo = info;
         }
 
diff --git a/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java b/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java
index 3443a44..c305ccf 100644
--- a/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java
+++ b/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java
@@ -104,15 +104,15 @@
         }
         for (VoiceInputHelper.InteractionInfo info : mHelper.mAvailableInteractionInfos) {
             if (TextUtils.equals(defaultKey, info.key)) {
-                return new DefaultVoiceInputPicker.VoiceInputDefaultAppInfo(mPackageManager,
-                        mUserId, info, true /* enabled */);
+                return new DefaultVoiceInputPicker.VoiceInputDefaultAppInfo(mContext,
+                        mPackageManager, mUserId, info, true /* enabled */);
             }
         }
 
         for (VoiceInputHelper.RecognizerInfo info : mHelper.mAvailableRecognizerInfos) {
             if (TextUtils.equals(defaultKey, info.key)) {
-                return new DefaultVoiceInputPicker.VoiceInputDefaultAppInfo(mPackageManager,
-                        mUserId, info, true /* enabled */);
+                return new DefaultVoiceInputPicker.VoiceInputDefaultAppInfo(mContext,
+                        mPackageManager, mUserId, info, true /* enabled */);
             }
         }
         return null;
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAppInfo.java b/src/com/android/settings/applications/defaultapps/DefaultAppInfo.java
index ec44af4..71b5ec4 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAppInfo.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAppInfo.java
@@ -18,6 +18,7 @@
 
 import android.app.AppGlobals;
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.ComponentInfo;
 import android.content.pm.PackageItemInfo;
@@ -25,6 +26,7 @@
 import android.graphics.drawable.Drawable;
 import android.os.RemoteException;
 import android.os.UserHandle;
+import android.util.IconDrawableFactory;
 
 import com.android.settings.widget.RadioButtonPickerFragment;
 import com.android.settingslib.wrapper.PackageManagerWrapper;
@@ -39,18 +41,20 @@
     public final PackageItemInfo packageItemInfo;
     public final String summary;
     protected final PackageManagerWrapper mPm;
+    private final Context mContext;
 
-    public DefaultAppInfo(PackageManagerWrapper pm, int uid, ComponentName cn) {
-        this(pm, uid, cn, null /* summary */);
+    public DefaultAppInfo(Context context, PackageManagerWrapper pm, int uid, ComponentName cn) {
+        this(context, pm, uid, cn, null /* summary */, true /* enabled */);
     }
 
-    public DefaultAppInfo(PackageManagerWrapper pm, int uid, ComponentName cn, String summary) {
-        this(pm, uid, cn, summary, true /* enabled */);
+    public DefaultAppInfo(Context context, PackageManagerWrapper pm, PackageItemInfo info) {
+        this(context, pm, info, null /* summary */, true /* enabled */);
     }
 
-    public DefaultAppInfo(PackageManagerWrapper pm, int uid, ComponentName cn, String summary,
-            boolean enabled) {
+    public DefaultAppInfo(Context context, PackageManagerWrapper pm, int uid, ComponentName cn,
+            String summary, boolean enabled) {
         super(enabled);
+        mContext = context;
         mPm = pm;
         packageItemInfo = null;
         userId = uid;
@@ -58,9 +62,10 @@
         this.summary = summary;
     }
 
-    public DefaultAppInfo(PackageManagerWrapper pm, PackageItemInfo info, String summary,
-            boolean enabled) {
+    public DefaultAppInfo(Context context, PackageManagerWrapper pm, PackageItemInfo info,
+            String summary, boolean enabled) {
         super(enabled);
+        mContext = context;
         mPm = pm;
         userId = UserHandle.myUserId();
         packageItemInfo = info;
@@ -68,10 +73,6 @@
         this.summary = summary;
     }
 
-    public DefaultAppInfo(PackageManagerWrapper pm, PackageItemInfo info) {
-        this(pm, info, null /* summary */, true /* enabled */);
-    }
-
     @Override
     public CharSequence loadLabel() {
         if (componentName != null) {
@@ -97,22 +98,29 @@
 
     @Override
     public Drawable loadIcon() {
+        final IconDrawableFactory factory = IconDrawableFactory.newInstance(mContext);
         if (componentName != null) {
             try {
                 final ComponentInfo componentInfo = getComponentInfo();
+                final ApplicationInfo appInfo = mPm.getApplicationInfoAsUser(
+                        componentName.getPackageName(), 0, userId);
                 if (componentInfo != null) {
-                    return componentInfo.loadIcon(mPm.getPackageManager());
+                    return factory.getBadgedIcon(componentInfo, appInfo, userId);
                 } else {
-                    final ApplicationInfo appInfo = mPm.getApplicationInfoAsUser(
-                            componentName.getPackageName(), 0, userId);
-                    return appInfo.loadIcon(mPm.getPackageManager());
+                    return factory.getBadgedIcon(appInfo);
                 }
             } catch (PackageManager.NameNotFoundException e) {
                 return null;
             }
         }
         if (packageItemInfo != null) {
-            return packageItemInfo.loadIcon(mPm.getPackageManager());
+            try {
+                final ApplicationInfo appInfo = mPm.getApplicationInfoAsUser(
+                        packageItemInfo.packageName, 0, userId);
+                return factory.getBadgedIcon(packageItemInfo, appInfo, userId);
+            } catch (PackageManager.NameNotFoundException e) {
+                return null;
+            }
         } else {
             return null;
         }
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java b/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java
index 34d1338..cc85f77 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java
@@ -187,10 +187,11 @@
         final List<DefaultAppInfo> candidates = new ArrayList<>();
         final List<ResolveInfo> resolveInfos = mPm.getPackageManager()
                 .queryIntentServices(AUTOFILL_PROBE, PackageManager.GET_META_DATA);
+        final Context context = getContext();
         for (ResolveInfo info : resolveInfos) {
             final String permission = info.serviceInfo.permission;
             if (Manifest.permission.BIND_AUTOFILL_SERVICE.equals(permission)) {
-                candidates.add(new DefaultAppInfo(mPm, mUserId, new ComponentName(
+                candidates.add(new DefaultAppInfo(context, mPm, mUserId, new ComponentName(
                         info.serviceInfo.packageName, info.serviceInfo.name)));
             }
         }
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceController.java
index 30aaf64..508cc63 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceController.java
@@ -62,7 +62,7 @@
         final String flattenComponent = Settings.Secure.getString(mContext.getContentResolver(),
                 DefaultAutofillPicker.SETTING);
         if (!TextUtils.isEmpty(flattenComponent)) {
-            DefaultAppInfo appInfo = new DefaultAppInfo(mPackageManager,
+            DefaultAppInfo appInfo = new DefaultAppInfo(mContext, mPackageManager,
                     mUserId, ComponentName.unflattenFromString(flattenComponent));
             return appInfo;
         }
diff --git a/src/com/android/settings/applications/defaultapps/DefaultBrowserPicker.java b/src/com/android/settings/applications/defaultapps/DefaultBrowserPicker.java
index e965052..fb9c3bf 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultBrowserPicker.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultBrowserPicker.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.applications.defaultapps;
 
+import android.content.Context;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 
@@ -47,7 +48,7 @@
     @Override
     protected List<DefaultAppInfo> getCandidates() {
         final List<DefaultAppInfo> candidates = new ArrayList<>();
-
+        final Context context = getContext();
         // Resolve that intent and check that the handleAllWebDataURI boolean is set
         final List<ResolveInfo> list = mPm.queryIntentActivitiesAsUser(
                 DefaultBrowserPreferenceController.BROWSE_PROBE, PackageManager.MATCH_ALL, mUserId);
@@ -59,7 +60,7 @@
                 continue;
             }
             try {
-                candidates.add(new DefaultAppInfo(mPm,
+                candidates.add(new DefaultAppInfo(context, mPm,
                         mPm.getApplicationInfoAsUser(info.activityInfo.packageName, 0, mUserId)));
             } catch (PackageManager.NameNotFoundException e) {
                 // Skip unknown packages.
diff --git a/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java
index a0bf0ca..916f9422 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.ComponentInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
@@ -25,6 +26,7 @@
 import android.net.Uri;
 import android.support.v7.preference.Preference;
 import android.text.TextUtils;
+import android.util.IconDrawableFactory;
 import android.util.Log;
 
 import java.util.List;
@@ -67,7 +69,7 @@
         try {
             final String packageName = mPackageManager.getDefaultBrowserPackageNameAsUser(mUserId);
             Log.d(TAG, "Get default browser package: " + packageName);
-            return new DefaultAppInfo(mPackageManager,
+            return new DefaultAppInfo(mContext, mPackageManager,
                     mPackageManager.getPackageManager().getApplicationInfo(packageName, 0));
         } catch (PackageManager.NameNotFoundException e) {
             return null;
@@ -124,8 +126,19 @@
             final ResolveInfo info = list.get(0);
             final ComponentInfo cn = info.getComponentInfo();
             final String packageName = cn == null ? null : cn.packageName;
+            if (TextUtils.isEmpty(packageName)) {
+                return null;
+            }
+            final ApplicationInfo appInfo;
+            try {
+                appInfo = mPackageManager.getPackageManager().getApplicationInfo(packageName, 0);
+            } catch (PackageManager.NameNotFoundException e) {
+                Log.w(TAG, "Error getting app info for " + packageName);
+                return null;
+            }
             Log.d(TAG, "Getting icon for the only browser app: " + packageName);
-            return info.loadIcon(mPackageManager.getPackageManager());
+            final IconDrawableFactory iconFactory = IconDrawableFactory.newInstance(mContext);
+            return iconFactory.getBadgedIcon(cn, appInfo, mUserId);
         }
         return null;
     }
diff --git a/src/com/android/settings/applications/defaultapps/DefaultEmergencyPicker.java b/src/com/android/settings/applications/defaultapps/DefaultEmergencyPicker.java
index 1d707df..8f8c64e 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultEmergencyPicker.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultEmergencyPicker.java
@@ -17,6 +17,7 @@
 package com.android.settings.applications.defaultapps;
 
 import android.content.ContentResolver;
+import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
@@ -44,12 +45,13 @@
         final List<ResolveInfo> infos = mPm.getPackageManager().queryIntentActivities(
                 DefaultEmergencyPreferenceController.QUERY_INTENT, 0);
         PackageInfo bestMatch = null;
+        final Context context = getContext();
         for (ResolveInfo info : infos) {
             try {
                 final PackageInfo packageInfo =
                         mPm.getPackageManager().getPackageInfo(info.activityInfo.packageName, 0);
                 final ApplicationInfo appInfo = packageInfo.applicationInfo;
-                candidates.add(new DefaultAppInfo(mPm, appInfo));
+                candidates.add(new DefaultAppInfo(context, mPm, appInfo));
                 // Get earliest installed system app.
                 if (isSystemApp(appInfo) && (bestMatch == null ||
                         bestMatch.firstInstallTime > packageInfo.firstInstallTime)) {
diff --git a/src/com/android/settings/applications/defaultapps/DefaultHomePicker.java b/src/com/android/settings/applications/defaultapps/DefaultHomePicker.java
index dca7ad1..75f5292 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultHomePicker.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultHomePicker.java
@@ -53,6 +53,7 @@
         final boolean mustSupportManagedProfile = hasManagedProfile();
         final List<DefaultAppInfo> candidates = new ArrayList<>();
         final List<ResolveInfo> homeActivities = new ArrayList<>();
+        final Context context = getContext();
         mPm.getHomeActivities(homeActivities);
 
         for (ResolveInfo resolveInfo : homeActivities) {
@@ -71,7 +72,7 @@
                 summary = null;
             }
             final DefaultAppInfo candidate =
-                    new DefaultAppInfo(mPm, mUserId, activityName, summary, enabled);
+                    new DefaultAppInfo(context, mPm, mUserId, activityName, summary, enabled);
             candidates.add(candidate);
         }
         return candidates;
diff --git a/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceController.java
index 1b229e8..bd8b5d1 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceController.java
@@ -61,11 +61,12 @@
         final ArrayList<ResolveInfo> homeActivities = new ArrayList<>();
         final ComponentName currentDefaultHome = mPackageManager.getHomeActivities(homeActivities);
         if (currentDefaultHome != null) {
-            return new DefaultAppInfo(mPackageManager, mUserId, currentDefaultHome);
+            return new DefaultAppInfo(mContext, mPackageManager, mUserId, currentDefaultHome);
         }
         final ActivityInfo onlyAppInfo = getOnlyAppInfo();
         if (onlyAppInfo != null) {
-            return new DefaultAppInfo(mPackageManager, mUserId, onlyAppInfo.getComponentName());
+            return new DefaultAppInfo(mContext, mPackageManager, mUserId,
+                    onlyAppInfo.getComponentName());
         }
         return null;
     }
diff --git a/src/com/android/settings/applications/defaultapps/DefaultPhonePicker.java b/src/com/android/settings/applications/defaultapps/DefaultPhonePicker.java
index fc643c8..9f6cc4d 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultPhonePicker.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultPhonePicker.java
@@ -48,9 +48,10 @@
         final List<DefaultAppInfo> candidates = new ArrayList<>();
         final List<String> dialerPackages =
                 DefaultDialerManager.getInstalledDialerApplications(getContext(), mUserId);
+        final Context context = getContext();
         for (String packageName : dialerPackages) {
             try {
-                candidates.add(new DefaultAppInfo(mPm,
+                candidates.add(new DefaultAppInfo(context, mPm,
                         mPm.getApplicationInfoAsUser(packageName, 0, mUserId)));
             } catch (PackageManager.NameNotFoundException e) {
                 // Skip unknown packages.
diff --git a/src/com/android/settings/applications/defaultapps/DefaultPhonePreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultPhonePreferenceController.java
index 712badb..92c9386 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultPhonePreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultPhonePreferenceController.java
@@ -57,7 +57,7 @@
     @Override
     protected DefaultAppInfo getDefaultAppInfo() {
         try {
-            return new DefaultAppInfo(mPackageManager,
+            return new DefaultAppInfo(mContext, mPackageManager,
                     mPackageManager.getPackageManager().getApplicationInfo(
                             DefaultDialerManager.getDefaultDialerApplication(mContext, mUserId),
                             0));
diff --git a/src/com/android/settings/applications/defaultapps/DefaultSmsPicker.java b/src/com/android/settings/applications/defaultapps/DefaultSmsPicker.java
index 966cd43..57159b3 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultSmsPicker.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultSmsPicker.java
@@ -41,13 +41,14 @@
 
     @Override
     protected List<DefaultAppInfo> getCandidates() {
+        final Context context = getContext();
         final Collection<SmsApplication.SmsApplicationData> smsApplications =
-                SmsApplication.getApplicationCollection(getContext());
+                SmsApplication.getApplicationCollection(context);
         final List<DefaultAppInfo> candidates = new ArrayList<>(smsApplications.size());
 
         for (SmsApplication.SmsApplicationData smsApplicationData : smsApplications) {
             try {
-                candidates.add(new DefaultAppInfo(mPm,
+                candidates.add(new DefaultAppInfo(context, mPm,
                         mPm.getApplicationInfoAsUser(smsApplicationData.mPackageName, 0, mUserId)));
             } catch (PackageManager.NameNotFoundException e) {
                 // Skip unknown packages.
diff --git a/src/com/android/settings/applications/defaultapps/DefaultSmsPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultSmsPreferenceController.java
index 63075b9..c3b7ac4 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultSmsPreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultSmsPreferenceController.java
@@ -47,7 +47,7 @@
     protected DefaultAppInfo getDefaultAppInfo() {
         final ComponentName app = SmsApplication.getDefaultSmsApplication(mContext, true);
         if (app != null) {
-            return new DefaultAppInfo(mPackageManager, mUserId, app);
+            return new DefaultAppInfo(mContext, mPackageManager, mUserId, app);
         }
         return null;
     }
diff --git a/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java b/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java
new file mode 100644
index 0000000..9ac2167
--- /dev/null
+++ b/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.manageapplications;
+
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.graphics.drawable.Drawable;
+import android.support.annotation.StringRes;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.widget.RecyclerView;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settingslib.applications.ApplicationsState;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
+
+public class ApplicationViewHolder extends RecyclerView.ViewHolder {
+
+    private final TextView mAppName;
+    private final ImageView mAppIcon;
+
+    @VisibleForTesting
+    final TextView mSummary;
+    @VisibleForTesting
+    final TextView mDisabled;
+
+    ApplicationViewHolder(View itemView) {
+        super(itemView);
+        mAppName = itemView.findViewById(android.R.id.title);
+        mAppIcon = itemView.findViewById(android.R.id.icon);
+        mSummary = itemView.findViewById(R.id.widget_text1);
+        mDisabled = itemView.findViewById(R.id.widget_text2);
+    }
+
+    static View newView(LayoutInflater inflater, ViewGroup parent) {
+        final View root = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.preference_app, parent, false);
+        inflater.inflate(R.layout.widget_text_views,
+                root.findViewById(android.R.id.widget_frame));
+        return root;
+    }
+
+    void setSummary(CharSequence summary) {
+        mSummary.setText(summary);
+    }
+
+    void setSummary(@StringRes int summary) {
+        mSummary.setText(summary);
+    }
+
+    void setEnabled(boolean isEnabled) {
+        itemView.setEnabled(isEnabled);
+    }
+
+    void setTitle(CharSequence title) {
+        if (title == null) {
+            return;
+        }
+        mAppName.setText(title);
+    }
+
+    void setIcon(Drawable icon) {
+        if (icon == null) {
+            return;
+        }
+        mAppIcon.setImageDrawable(icon);
+    }
+
+    void updateDisableView(ApplicationInfo info) {
+        if ((info.flags & ApplicationInfo.FLAG_INSTALLED) == 0) {
+            mDisabled.setVisibility(View.VISIBLE);
+            mDisabled.setText(R.string.not_installed);
+        } else if (!info.enabled || info.enabledSetting
+                == PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED) {
+            mDisabled.setVisibility(View.VISIBLE);
+            mDisabled.setText(R.string.disabled);
+        } else {
+            mDisabled.setVisibility(View.GONE);
+        }
+    }
+
+    void updateSizeText(AppEntry entry, CharSequence invalidSizeStr, int whichSize) {
+        if (ManageApplications.DEBUG) {
+            Log.d(ManageApplications.TAG, "updateSizeText of "
+                    + entry.label + " " + entry + ": " + entry.sizeStr);
+        }
+        if (entry.sizeStr != null) {
+            switch (whichSize) {
+                case ManageApplications.SIZE_INTERNAL:
+                    setSummary(entry.internalSizeStr);
+                    break;
+                case ManageApplications.SIZE_EXTERNAL:
+                    setSummary(entry.externalSizeStr);
+                    break;
+                default:
+                    setSummary(entry.sizeStr);
+                    break;
+            }
+        } else if (entry.size == ApplicationsState.SIZE_INVALID) {
+            setSummary(invalidSizeStr);
+        }
+    }
+}
diff --git a/src/com/android/settings/applications/manageapplications/FileViewHolderController.java b/src/com/android/settings/applications/manageapplications/FileViewHolderController.java
index 03e2e55..4e6bf26 100644
--- a/src/com/android/settings/applications/manageapplications/FileViewHolderController.java
+++ b/src/com/android/settings/applications/manageapplications/FileViewHolderController.java
@@ -35,12 +35,14 @@
 
     /**
      * Initializes the view within an AppViewHolder.
+     *
      * @param holder The holder to use to initialize.
      */
-    void setupView(AppViewHolder holder);
+    void setupView(ApplicationViewHolder holder);
 
     /**
      * Handles the behavior when the view is clicked.
+     *
      * @param fragment Fragment where the click originated.
      */
     void onClick(Fragment fragment);
diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java
index 932b2dd..3caa8ab 100644
--- a/src/com/android/settings/applications/manageapplications/ManageApplications.java
+++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java
@@ -40,16 +40,14 @@
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageItemInfo;
-import android.content.pm.PackageManager;
-import android.icu.text.AlphabeticIndex;
 import android.os.Bundle;
 import android.os.Environment;
-import android.os.Handler;
-import android.os.LocaleList;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.preference.PreferenceFrameLayout;
 import android.support.annotation.VisibleForTesting;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.util.ArraySet;
 import android.util.Log;
@@ -59,19 +57,11 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.AbsListView;
 import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
 import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.ArrayAdapter;
-import android.widget.BaseAdapter;
-import android.widget.Filter;
-import android.widget.Filterable;
 import android.widget.FrameLayout;
-import android.widget.ListView;
-import android.widget.SectionIndexer;
 import android.widget.Spinner;
-import android.widget.TextView;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
@@ -86,7 +76,6 @@
 import com.android.settings.Settings.UsageAccessSettingsActivity;
 import com.android.settings.Settings.WriteSettingsActivity;
 import com.android.settings.SettingsActivity;
-import com.android.settings.Utils;
 import com.android.settings.applications.AppInfoBase;
 import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
 import com.android.settings.applications.AppStateBaseBridge;
@@ -122,13 +111,13 @@
 import com.android.settingslib.applications.ApplicationsState.CompoundFilter;
 import com.android.settingslib.applications.ApplicationsState.VolumeFilter;
 import com.android.settingslib.applications.StorageStatsSource;
+import com.android.settingslib.utils.ThreadUtils;
 import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.Locale;
 import java.util.Set;
 
 /**
@@ -138,7 +127,7 @@
  * intent.
  */
 public class ManageApplications extends InstrumentedPreferenceFragment
-        implements OnItemClickListener, OnItemSelectedListener {
+        implements View.OnClickListener, OnItemSelectedListener {
 
     static final String TAG = "ManageApplications";
     static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
@@ -185,23 +174,17 @@
     private ApplicationsState mApplicationsState;
 
     public int mListType;
-    public AppFilterItem mFilter;
-
-    public ApplicationsAdapter mApplications;
+    private AppFilterItem mFilter;
+    private ApplicationsAdapter mApplications;
 
     private View mLoadingContainer;
 
     private View mListContainer;
-
-    // ListView used to display list
-    private ListView mListView;
+    private RecyclerView mRecyclerView;
 
     // Size resource used for packages whose size computation failed for some reason
     CharSequence mInvalidSizeStr;
 
-    // layout inflater object used to inflate views
-    private LayoutInflater mInflater;
-
     private String mCurrentPkgName;
     private int mCurrentUid;
 
@@ -234,6 +217,7 @@
     private int mStorageType;
     private boolean mIsWorkOnly;
     private int mWorkUserId;
+    private View mEmptyView;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -304,25 +288,14 @@
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
-        // initialize the inflater
-        mInflater = inflater;
-
         mRootView = inflater.inflate(R.layout.manage_applications_apps, null);
         mLoadingContainer = mRootView.findViewById(R.id.loading_container);
         mListContainer = mRootView.findViewById(R.id.list_container);
         if (mListContainer != null) {
             // Create adapter and list view here
-            View emptyView = mListContainer.findViewById(com.android.internal.R.id.empty);
-            ListView lv = mListContainer.findViewById(android.R.id.list);
-            if (emptyView != null) {
-                lv.setEmptyView(emptyView);
-            }
-            lv.setOnItemClickListener(this);
-            lv.setSaveEnabled(true);
-            lv.setItemsCanFocus(true);
-            lv.setTextFilterEnabled(true);
-            mListView = lv;
-            mApplications = new ApplicationsAdapter(mApplicationsState, this, mFilter);
+            mEmptyView = mListContainer.findViewById(android.R.id.empty);
+            mApplications = new ApplicationsAdapter(mApplicationsState, this, mFilter,
+                    savedInstanceState);
             if (savedInstanceState != null) {
                 mApplications.mHasReceivedLoadEntries =
                         savedInstanceState.getBoolean(EXTRA_HAS_ENTRIES, false);
@@ -347,11 +320,10 @@
                                 mVolumeUuid,
                                 UserHandle.of(userId)));
             }
-            mListView.setAdapter(mApplications);
-            mListView.setRecyclerListener(mApplications);
-            mListView.setFastScrollEnabled(isFastScrollEnabled());
-
-            Utils.prepareCustomPreferencesList(container, mRootView, mListView, false);
+            mRecyclerView = mListContainer.findViewById(R.id.apps_list);
+            mRecyclerView.setLayoutManager(new LinearLayoutManager(
+                    getContext(), RecyclerView.VERTICAL, false /* reverseLayout */));
+            mRecyclerView.setAdapter(mApplications);
         }
 
         // We have to do this now because PreferenceFrameLayout looks at it
@@ -492,6 +464,9 @@
         outState.putBoolean(EXTRA_SHOW_SYSTEM, mShowSystem);
         outState.putBoolean(EXTRA_HAS_ENTRIES, mApplications.mHasReceivedLoadEntries);
         outState.putBoolean(EXTRA_HAS_BRIDGE, mApplications.mHasReceivedBridgeCallback);
+        if (mApplications != null) {
+            mApplications.onSaveInstanceState(outState);
+        }
     }
 
     @Override
@@ -633,7 +608,6 @@
             case R.id.sort_order_alpha:
             case R.id.sort_order_size:
                 mSortOrder = menuId;
-                mListView.setFastScrollEnabled(isFastScrollEnabled());
                 if (mApplications != null) {
                     mApplications.rebuild(mSortOrder);
                 }
@@ -667,11 +641,16 @@
     }
 
     @Override
-    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+    public void onClick(View view) {
         if (mApplications == null) {
             return;
         }
+        final int position = mRecyclerView.getChildAdapterPosition(view);
 
+        if (position == RecyclerView.NO_POSITION) {
+            Log.w(TAG, "Cannot find position for child, skipping onClick handling");
+            return;
+        }
         if (mApplications.getApplicationCount() > position) {
             ApplicationsState.AppEntry entry = mApplications.getAppEntry(position);
             mCurrentPkgName = entry.info.packageName;
@@ -757,7 +736,9 @@
                     mFilterOptions.size() > 1 ? View.VISIBLE : View.GONE);
             notifyDataSetChanged();
             if (mFilterOptions.size() == 1) {
-                if (DEBUG) Log.d(TAG, "Auto selecting filter " + filter);
+                if (DEBUG) {
+                    Log.d(TAG, "Auto selecting filter " + filter);
+                }
                 mManageApplications.mFilterSpinner.setSelection(0);
                 mManageApplications.onItemSelected(null, null, 0, 0);
             }
@@ -777,7 +758,9 @@
             notifyDataSetChanged();
             if (mManageApplications.mFilter == filter) {
                 if (mFilterOptions.size() > 0) {
-                    if (DEBUG) Log.d(TAG, "Auto selecting filter " + mFilterOptions.get(0));
+                    if (DEBUG) {
+                        Log.d(TAG, "Auto selecting filter " + mFilterOptions.get(0));
+                    }
                     mManageApplications.mFilterSpinner.setSelection(0);
                     mManageApplications.onItemSelected(null, null, 0, 0);
                 }
@@ -795,38 +778,25 @@
         }
     }
 
-    /*
-     * Custom adapter implementation for the ListView
-     * This adapter maintains a map for each displayed application and its properties
-     * An index value on each AppInfo object indicates the correct position or index
-     * in the list. If the list gets updated dynamically when the user is viewing the list of
-     * applications, we need to return the correct index of position. This is done by mapping
-     * the getId methods via the package name into the internal maps and indices.
-     * The order of applications in the list is mirrored in mAppLocalList
-     */
-    static class ApplicationsAdapter extends BaseAdapter implements Filterable,
-            ApplicationsState.Callbacks, AppStateBaseBridge.Callback,
-            AbsListView.RecyclerListener, SectionIndexer {
+    static class ApplicationsAdapter extends RecyclerView.Adapter<ApplicationViewHolder>
+            implements ApplicationsState.Callbacks, AppStateBaseBridge.Callback {
 
-        private static final SectionInfo[] EMPTY_SECTIONS = new SectionInfo[0];
+        private static final String STATE_LAST_SCROLL_INDEX = "state_last_scroll_index";
+        private static final int VIEW_TYPE_APP = 0;
+        private static final int VIEW_TYPE_EXTRA_VIEW = 1;
 
         private final ApplicationsState mState;
         private final ApplicationsState.Session mSession;
         private final ManageApplications mManageApplications;
         private final Context mContext;
-        private final ArrayList<View> mActive = new ArrayList<>();
         private final AppStateBaseBridge mExtraInfoBridge;
-        private final Handler mBgHandler;
-        private final Handler mFgHandler;
         private final LoadingViewController mLoadingViewController;
 
         private AppFilterItem mAppFilter;
-        private ArrayList<ApplicationsState.AppEntry> mBaseEntries;
         private ArrayList<ApplicationsState.AppEntry> mEntries;
         private boolean mResumed;
         private int mLastSortMode = -1;
         private int mWhichSize = SIZE_TOTAL;
-        CharSequence mCurFilterPrefix;
         private AppFilter mCompositeFilter;
         private boolean mHasReceivedLoadEntries;
         private boolean mHasReceivedBridgeCallback;
@@ -836,39 +806,11 @@
         // fragment is paused. We need this special handling because app entries are added gradually
         // when we rebuild the list after the user made some changes, like uninstalling an app.
         private int mLastIndex = -1;
-        private int mLastTop;
-
-        private AlphabeticIndex.ImmutableIndex<Locale> mIndex;
-        private SectionInfo[] mSections = EMPTY_SECTIONS;
-        private int[] mPositionToSectionIndex;
-
-        private Filter mFilter = new Filter() {
-            @Override
-            protected FilterResults performFiltering(CharSequence constraint) {
-                ArrayList<ApplicationsState.AppEntry> entries
-                        = applyPrefixFilter(constraint, mBaseEntries);
-                FilterResults fr = new FilterResults();
-                fr.values = entries;
-                fr.count = entries.size();
-                return fr;
-            }
-
-            @Override
-            @SuppressWarnings("unchecked")
-            protected void publishResults(CharSequence constraint, FilterResults results) {
-                mCurFilterPrefix = constraint;
-                mEntries = (ArrayList<ApplicationsState.AppEntry>) results.values;
-                rebuildSections();
-                notifyDataSetChanged();
-            }
-        };
-
 
         public ApplicationsAdapter(ApplicationsState state, ManageApplications manageApplications,
-                AppFilterItem appFilter) {
+                AppFilterItem appFilter, Bundle savedInstanceState) {
+            setHasStableIds(true);
             mState = state;
-            mFgHandler = new Handler();
-            mBgHandler = new Handler(mState.getBackgroundLooper());
             mSession = state.newSession(this);
             mManageApplications = manageApplications;
             mLoadingViewController = new LoadingViewController(
@@ -893,6 +835,9 @@
             } else {
                 mExtraInfoBridge = null;
             }
+            if (savedInstanceState != null) {
+                mLastIndex = savedInstanceState.getInt(STATE_LAST_SCROLL_INDEX);
+            }
         }
 
         public void setCompositeFilter(AppFilter compositeFilter) {
@@ -907,9 +852,11 @@
 
         public void setExtraViewController(FileViewHolderController extraViewController) {
             mExtraViewController = extraViewController;
-            mBgHandler.post(() -> {
+            // Start to query extra view's stats on background, and once done post result to main
+            // thread.
+            ThreadUtils.postOnBackgroundThread(() -> {
                 mExtraViewController.queryStats();
-                mFgHandler.post(() -> {
+                ThreadUtils.postOnMainThread(() -> {
                     onExtraViewCompleted();
                 });
             });
@@ -938,11 +885,13 @@
                     mExtraInfoBridge.pause();
                 }
             }
+        }
+
+        public void onSaveInstanceState(Bundle outState) {
             // Record the current scroll position before pausing.
-            mLastIndex = mManageApplications.mListView.getFirstVisiblePosition();
-            View v = mManageApplications.mListView.getChildAt(0);
-            mLastTop =
-                    (v == null) ? 0 : (v.getTop() - mManageApplications.mListView.getPaddingTop());
+            final LinearLayoutManager layoutManager =
+                    (LinearLayoutManager) mManageApplications.mRecyclerView.getLayoutManager();
+            outState.putInt(STATE_LAST_SCROLL_INDEX, layoutManager.findFirstVisibleItemPosition());
         }
 
         public void release() {
@@ -960,6 +909,21 @@
             rebuild();
         }
 
+        @Override
+        public ApplicationViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+            final View view = ApplicationViewHolder.newView(
+                    LayoutInflater.from(parent.getContext()), parent);
+            return new ApplicationViewHolder(view);
+        }
+
+        @Override
+        public int getItemViewType(int position) {
+            boolean isLastItem = (getItemCount() - 1) == position;
+            return hasExtraView() && isLastItem
+                    ? VIEW_TYPE_EXTRA_VIEW
+                    : VIEW_TYPE_APP;
+        }
+
         public void rebuild() {
             if (!mHasReceivedLoadEntries
                     || (mExtraInfoBridge != null && !mHasReceivedBridgeCallback)) {
@@ -1008,11 +972,11 @@
 
             filterObj = new CompoundFilter(filterObj, ApplicationsState.FILTER_NOT_HIDE);
             AppFilter finalFilterObj = filterObj;
-            mBgHandler.post(() -> {
+            ThreadUtils.postOnBackgroundThread(() -> {
                 final ArrayList<AppEntry> entries = mSession.rebuild(finalFilterObj,
                         comparatorObj, false);
                 if (entries != null) {
-                    mFgHandler.post(() -> onRebuildComplete(entries));
+                    ThreadUtils.postOnMainThread(() -> onRebuildComplete(entries));
                 }
             });
         }
@@ -1031,8 +995,7 @@
                 ArrayList<ApplicationsState.AppEntry> entries) {
             int size = entries.size();
             // returnList will not have more entries than entries
-            ArrayList<ApplicationsState.AppEntry> returnEntries = new
-                    ArrayList<ApplicationsState.AppEntry>(size);
+            ArrayList<ApplicationsState.AppEntry> returnEntries = new ArrayList<>(size);
 
             // assume appinfo of same package but different users are grouped together
             PackageItemInfo lastInfo = null;
@@ -1055,21 +1018,19 @@
                     filterType == FILTER_APPS_POWER_WHITELIST_ALL) {
                 entries = removeDuplicateIgnoringUser(entries);
             }
-            mBaseEntries = entries;
-            if (mBaseEntries != null) {
-                mEntries = applyPrefixFilter(mCurFilterPrefix, mBaseEntries);
-                rebuildSections();
-            } else {
-                mEntries = null;
-                mSections = EMPTY_SECTIONS;
-                mPositionToSectionIndex = null;
-            }
-
+            mEntries = entries;
             notifyDataSetChanged();
+            if (getItemCount() == 0) {
+                mManageApplications.mRecyclerView.setVisibility(View.GONE);
+                mManageApplications.mEmptyView.setVisibility(View.VISIBLE);
+            } else {
+                mManageApplications.mEmptyView.setVisibility(View.GONE);
+                mManageApplications.mRecyclerView.setVisibility(View.VISIBLE);
+            }
             // Restore the last scroll position if the number of entries added so far is bigger than
             // it.
-            if (mLastIndex != -1 && getCount() > mLastIndex) {
-                mManageApplications.mListView.setSelectionFromTop(mLastIndex, mLastTop);
+            if (mLastIndex != -1 && getItemCount() > mLastIndex) {
+                mManageApplications.mRecyclerView.getLayoutManager().scrollToPosition(mLastIndex);
                 mLastIndex = -1;
             }
 
@@ -1086,45 +1047,6 @@
             mManageApplications.setHasInstant(mState.haveInstantApps());
         }
 
-        private void rebuildSections() {
-            if (mEntries != null && mManageApplications.mListView.isFastScrollEnabled()) {
-                // Rebuild sections
-                if (mIndex == null) {
-                    LocaleList locales = mContext.getResources().getConfiguration().getLocales();
-                    if (locales.size() == 0) {
-                        locales = new LocaleList(Locale.ENGLISH);
-                    }
-                    AlphabeticIndex<Locale> index = new AlphabeticIndex(locales.get(0));
-                    int localeCount = locales.size();
-                    for (int i = 1; i < localeCount; i++) {
-                        index.addLabels(locales.get(i));
-                    }
-                    // Ensure we always have some base English locale buckets
-                    index.addLabels(Locale.ENGLISH);
-                    mIndex = index.buildImmutableIndex();
-                }
-
-                ArrayList<SectionInfo> sections = new ArrayList<>();
-                int lastSecId = -1;
-                int totalEntries = mEntries.size();
-                mPositionToSectionIndex = new int[totalEntries];
-
-                for (int pos = 0; pos < totalEntries; pos++) {
-                    String label = mEntries.get(pos).label;
-                    int secId = mIndex.getBucketIndex(TextUtils.isEmpty(label) ? "" : label);
-                    if (secId != lastSecId) {
-                        lastSecId = secId;
-                        sections.add(new SectionInfo(mIndex.getBucket(secId).getLabel(), pos));
-                    }
-                    mPositionToSectionIndex[pos] = sections.size() - 1;
-                }
-                mSections = sections.toArray(EMPTY_SECTIONS);
-            } else {
-                mSections = EMPTY_SECTIONS;
-                mPositionToSectionIndex = null;
-            }
-        }
-
         @VisibleForTesting
         void updateLoading() {
             final boolean appLoaded = mHasReceivedLoadEntries && mSession.getAllApps().size() != 0;
@@ -1135,26 +1057,6 @@
             }
         }
 
-        ArrayList<ApplicationsState.AppEntry> applyPrefixFilter(CharSequence prefix,
-                ArrayList<ApplicationsState.AppEntry> origEntries) {
-            if (prefix == null || prefix.length() == 0) {
-                return origEntries;
-            } else {
-                String prefixStr = ApplicationsState.normalize(prefix.toString());
-                final String spacePrefixStr = " " + prefixStr;
-                ArrayList<ApplicationsState.AppEntry> newEntries
-                        = new ArrayList<ApplicationsState.AppEntry>();
-                for (int i = 0; i < origEntries.size(); i++) {
-                    ApplicationsState.AppEntry entry = origEntries.get(i);
-                    String nlabel = entry.getNormalizedLabel();
-                    if (nlabel.startsWith(prefixStr) || nlabel.indexOf(spacePrefixStr) != -1) {
-                        newEntries.add(entry);
-                    }
-                }
-                return newEntries;
-            }
-        }
-
         @Override
         public void onExtraInfoUpdated() {
             mHasReceivedBridgeCallback = true;
@@ -1186,29 +1088,27 @@
 
         @Override
         public void onPackageSizeChanged(String packageName) {
-            for (int i = 0; i < mActive.size(); i++) {
-                AppViewHolder holder = (AppViewHolder) mActive.get(i).getTag();
-                if (holder == null || holder.entry == null) {
+            if (mEntries == null) {
+                return;
+            }
+            final int size = mEntries.size();
+            for (int i = 0; i < size; i++) {
+                final AppEntry entry = mEntries.get(i);
+                final ApplicationInfo info = entry.info;
+                if (info == null && !TextUtils.equals(packageName, info.packageName)) {
                     continue;
                 }
-                ApplicationInfo info = holder.entry.info;
-                if (info == null) {
-                    continue;
-                }
-                if (holder.entry.info.packageName.equals(packageName)) {
-                    synchronized (holder.entry) {
-                        updateSummary(holder);
-                    }
-                    if (holder.entry.info.packageName.equals(mManageApplications.mCurrentPkgName)
-                            && mLastSortMode == R.id.sort_order_size) {
-                        // We got the size information for the last app the
-                        // user viewed, and are sorting by size...  they may
-                        // have cleared data, so we immediately want to resort
-                        // the list with the new size to reflect it to the user.
-                        rebuild();
-                    }
+                if (TextUtils.equals(mManageApplications.mCurrentPkgName, info.packageName)) {
+                    // We got the size information for the last app the
+                    // user viewed, and are sorting by size...  they may
+                    // have cleared data, so we immediately want to resort
+                    // the list with the new size to reflect it to the user.
+                    rebuild();
                     return;
+                } else {
+                    notifyItemChanged(i);
                 }
+
             }
         }
 
@@ -1227,46 +1127,30 @@
         }
 
         public void onExtraViewCompleted() {
-            int size = mActive.size();
-            // If we have no elements, don't do anything.
-            if (size < 1) {
+            if (!hasExtraView()) {
                 return;
             }
-            AppViewHolder holder = (AppViewHolder) mActive.get(size - 1).getTag();
-
-            // HACK: The extra view has no AppEntry -- and should be the only element without one.
-            // Thus, if the last active element has no AppEntry, it is the extra view.
-            if (holder == null || holder.entry != null) {
-                return;
-            }
-
-            mExtraViewController.setupView(holder);
+            // Update last item - this is assumed to be the extra view.
+            notifyItemChanged(getItemCount() - 1);
         }
 
-        public int getCount() {
+        @Override
+        public int getItemCount() {
             if (mEntries == null) {
                 return 0;
             }
-            int extraViewAddition =
-                    (mExtraViewController != null && mExtraViewController.shouldShow()) ? 1 : 0;
-            return mEntries.size() + extraViewAddition;
+            return mEntries.size() + (hasExtraView() ? 1 : 0);
         }
 
         public int getApplicationCount() {
             return mEntries != null ? mEntries.size() : 0;
         }
 
-        public Object getItem(int position) {
-            if (position == mEntries.size()) {
-                return mExtraViewController;
-            }
+        public AppEntry getAppEntry(int position) {
             return mEntries.get(position);
         }
 
-        public ApplicationsState.AppEntry getAppEntry(int position) {
-            return mEntries.get(position);
-        }
-
+        @Override
         public long getItemId(int position) {
             if (position == mEntries.size()) {
                 return -1;
@@ -1274,142 +1158,76 @@
             return mEntries.get(position).id;
         }
 
-        @Override
-        public boolean areAllItemsEnabled() {
-            return false;
-        }
-
-        @Override
         public boolean isEnabled(int position) {
-            if (position == mEntries.size() && mExtraViewController != null &&
-                    mExtraViewController.shouldShow()) {
-                return true;
-            }
-
-            if (mManageApplications.mListType != LIST_TYPE_HIGH_POWER) {
+            if (getItemViewType(position) == VIEW_TYPE_EXTRA_VIEW
+                    || mManageApplications.mListType != LIST_TYPE_HIGH_POWER) {
                 return true;
             }
             ApplicationsState.AppEntry entry = mEntries.get(position);
             return !PowerWhitelistBackend.getInstance().isSysWhitelisted(entry.info.packageName);
         }
 
-        public View getView(int position, View convertView, ViewGroup parent) {
-            // A ViewHolder keeps references to children views to avoid unnecessary calls
-            // to findViewById() on each row.
-            AppViewHolder holder = AppViewHolder.createOrRecycle(mManageApplications.mInflater,
-                    convertView);
-            convertView = holder.rootView;
-
-            // Handle the extra view if it is the last entry.
+        @Override
+        public void onBindViewHolder(ApplicationViewHolder holder, int position) {
             if (mEntries != null && mExtraViewController != null && position == mEntries.size()) {
+                // set up view for extra view controller
                 mExtraViewController.setupView(holder);
-                convertView.setEnabled(true);
             } else {
                 // Bind the data efficiently with the holder
                 ApplicationsState.AppEntry entry = mEntries.get(position);
                 synchronized (entry) {
-                    holder.entry = entry;
-                    if (entry.label != null) {
-                        holder.appName.setText(entry.label);
-                    }
+                    holder.setTitle(entry.label);
                     mState.ensureIcon(entry);
-                    if (entry.icon != null) {
-                        holder.appIcon.setImageDrawable(entry.icon);
-                    }
-                    updateSummary(holder);
-                    updateDisableView(holder.disabled, entry.info);
+                    holder.setIcon(entry.icon);
+                    updateSummary(holder, entry);
+                    holder.updateDisableView(entry.info);
                 }
-                convertView.setEnabled(isEnabled(position));
+                holder.setEnabled(isEnabled(position));
             }
-
-            mActive.remove(convertView);
-            mActive.add(convertView);
-            return convertView;
+            holder.itemView.setOnClickListener(mManageApplications);
         }
 
-        @VisibleForTesting
-        void updateDisableView(TextView view, ApplicationInfo info) {
-            if ((info.flags & ApplicationInfo.FLAG_INSTALLED) == 0) {
-                view.setVisibility(View.VISIBLE);
-                view.setText(R.string.not_installed);
-            } else if (!info.enabled || info.enabledSetting
-                    == PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED) {
-                view.setVisibility(View.VISIBLE);
-                view.setText(R.string.disabled);
-            } else {
-                view.setVisibility(View.GONE);
-            }
-        }
-
-        private void updateSummary(AppViewHolder holder) {
+        private void updateSummary(ApplicationViewHolder holder, AppEntry entry) {
             switch (mManageApplications.mListType) {
                 case LIST_TYPE_NOTIFICATION:
-                    if (holder.entry.extraInfo != null) {
-                        holder.summary.setText(InstalledAppDetails.getNotificationSummary(
-                                (AppRow) holder.entry.extraInfo, mContext));
+                    if (entry.extraInfo != null) {
+                        holder.setSummary(InstalledAppDetails.getNotificationSummary(
+                                (AppRow) entry.extraInfo, mContext));
                     } else {
-                        holder.summary.setText(null);
+                        holder.setSummary(null);
                     }
                     break;
-
                 case LIST_TYPE_USAGE_ACCESS:
-                    if (holder.entry.extraInfo != null) {
-                        holder.summary.setText((new UsageState((PermissionState) holder.entry
-                                .extraInfo)).isPermissible()
-                                ? R.string.app_permission_summary_allowed
-                                : R.string.app_permission_summary_not_allowed);
+                    if (entry.extraInfo != null) {
+                        holder.setSummary(
+                                (new UsageState((PermissionState) entry.extraInfo)).isPermissible()
+                                        ? R.string.app_permission_summary_allowed
+                                        : R.string.app_permission_summary_not_allowed);
                     } else {
-                        holder.summary.setText(null);
+                        holder.setSummary(null);
                     }
                     break;
-
                 case LIST_TYPE_HIGH_POWER:
-                    holder.summary.setText(HighPowerDetail.getSummary(mContext, holder.entry));
+                    holder.setSummary(HighPowerDetail.getSummary(mContext, entry));
                     break;
-
                 case LIST_TYPE_OVERLAY:
-                    holder.summary.setText(DrawOverlayDetails.getSummary(mContext, holder.entry));
+                    holder.setSummary(DrawOverlayDetails.getSummary(mContext, entry));
                     break;
-
                 case LIST_TYPE_WRITE_SETTINGS:
-                    holder.summary.setText(WriteSettingsDetails.getSummary(mContext,
-                            holder.entry));
+                    holder.setSummary(WriteSettingsDetails.getSummary(mContext, entry));
                     break;
-
                 case LIST_TYPE_MANAGE_SOURCES:
-                    holder.summary.setText(ExternalSourcesDetails.getPreferenceSummary(mContext,
-                            holder.entry));
+                    holder.setSummary(ExternalSourcesDetails.getPreferenceSummary(mContext, entry));
                     break;
-
                 default:
-                    holder.updateSizeText(mManageApplications.mInvalidSizeStr, mWhichSize);
+                    holder.updateSizeText(entry, mManageApplications.mInvalidSizeStr, mWhichSize);
                     break;
             }
         }
 
-        @Override
-        public Filter getFilter() {
-            return mFilter;
-        }
-
-        @Override
-        public void onMovedToScrapHeap(View view) {
-            mActive.remove(view);
-        }
-
-        @Override
-        public Object[] getSections() {
-            return mSections;
-        }
-
-        @Override
-        public int getPositionForSection(int sectionIndex) {
-            return mSections[sectionIndex].position;
-        }
-
-        @Override
-        public int getSectionForPosition(int position) {
-            return mPositionToSectionIndex[position];
+        private boolean hasExtraView() {
+            return mExtraViewController != null
+                    && mExtraViewController.shouldShow();
         }
     }
 
@@ -1439,21 +1257,6 @@
         }
     }
 
-    private static class SectionInfo {
-        final String label;
-        final int position;
-
-        public SectionInfo(String label, int position) {
-            this.label = label;
-            this.position = position;
-        }
-
-        @Override
-        public String toString() {
-            return label;
-        }
-    }
-
     public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
             = new SummaryLoader.SummaryProviderFactory() {
         @Override
diff --git a/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java b/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java
index 1e44047..2a2ac3b 100644
--- a/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java
+++ b/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java
@@ -72,11 +72,11 @@
     }
 
     @Override
-    public void setupView(AppViewHolder holder) {
-        holder.appIcon.setImageDrawable(
+    public void setupView(ApplicationViewHolder holder) {
+        holder.setIcon(
                 new InsetDrawable(mContext.getDrawable(R.drawable.ic_headset_24dp), INSET_SIZE));
-        holder.appName.setText(mContext.getText(R.string.audio_files_title));
-        holder.summary.setText(Formatter.formatFileSize(mContext, mMusicSize));
+        holder.setTitle(mContext.getText(R.string.audio_files_title));
+        holder.setSummary(Formatter.formatFileSize(mContext, mMusicSize));
     }
 
     @Override
diff --git a/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java b/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java
index 2d77f26..fafa875 100644
--- a/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java
+++ b/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java
@@ -71,11 +71,11 @@
     }
 
     @Override
-    public void setupView(AppViewHolder holder) {
-        holder.appIcon.setImageDrawable(
+    public void setupView(ApplicationViewHolder holder) {
+        holder.setIcon(
                 new InsetDrawable(mContext.getDrawable(R.drawable.ic_photo_library), INSET_SIZE));
-        holder.appName.setText(mContext.getText(R.string.storage_detail_images));
-        holder.summary.setText(Formatter.formatFileSize(mContext, mFilesSize));
+        holder.setTitle(mContext.getText(R.string.storage_detail_images));
+        holder.setSummary(Formatter.formatFileSize(mContext, mFilesSize));
     }
 
     @Override
diff --git a/src/com/android/settings/core/InstrumentedFragment.java b/src/com/android/settings/core/InstrumentedFragment.java
index 188dbde..45db836 100644
--- a/src/com/android/settings/core/InstrumentedFragment.java
+++ b/src/com/android/settings/core/InstrumentedFragment.java
@@ -49,4 +49,8 @@
         mVisibilityLoggerMixin.setSourceMetricsCategory(getActivity());
         super.onResume();
     }
+
+    protected final VisibilityLoggerMixin getVisibilityLogger() {
+        return mVisibilityLoggerMixin;
+    }
 }
diff --git a/src/com/android/settings/datetime/TimeFormatPreferenceController.java b/src/com/android/settings/datetime/TimeFormatPreferenceController.java
index c594b26..302c624 100644
--- a/src/com/android/settings/datetime/TimeFormatPreferenceController.java
+++ b/src/com/android/settings/datetime/TimeFormatPreferenceController.java
@@ -103,6 +103,7 @@
 
     static void timeUpdated(Context context, Boolean is24Hour) {
         Intent timeChanged = new Intent(Intent.ACTION_TIME_CHANGED);
+        timeChanged.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
         int timeFormatPreference;
         if (is24Hour == null) {
             timeFormatPreference = Intent.EXTRA_TIME_PREF_VALUE_USE_LOCALE_DEFAULT;
diff --git a/src/com/android/settings/development/AppPicker.java b/src/com/android/settings/development/AppPicker.java
index d038b8f..433f31a 100644
--- a/src/com/android/settings/development/AppPicker.java
+++ b/src/com/android/settings/development/AppPicker.java
@@ -32,7 +32,6 @@
 import android.widget.ListView;
 
 import com.android.settings.R;
-import com.android.settings.applications.manageapplications.AppViewHolder;
 
 import java.text.Collator;
 import java.util.ArrayList;
diff --git a/src/com/android/settings/applications/manageapplications/AppViewHolder.java b/src/com/android/settings/development/AppViewHolder.java
similarity index 71%
rename from src/com/android/settings/applications/manageapplications/AppViewHolder.java
rename to src/com/android/settings/development/AppViewHolder.java
index 7b9d766..7a90bcf 100644
--- a/src/com/android/settings/applications/manageapplications/AppViewHolder.java
+++ b/src/com/android/settings/development/AppViewHolder.java
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package com.android.settings.applications.manageapplications;
+package com.android.settings.development;
 
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -57,24 +56,4 @@
             return (AppViewHolder)convertView.getTag();
         }
     }
-
-    void updateSizeText(CharSequence invalidSizeStr, int whichSize) {
-        if (ManageApplications.DEBUG) Log.i(ManageApplications.TAG, "updateSizeText of "
-                + entry.label + " " + entry + ": " + entry.sizeStr);
-        if (entry.sizeStr != null) {
-            switch (whichSize) {
-                case ManageApplications.SIZE_INTERNAL:
-                    summary.setText(entry.internalSizeStr);
-                    break;
-                case ManageApplications.SIZE_EXTERNAL:
-                    summary.setText(entry.externalSizeStr);
-                    break;
-                default:
-                    summary.setText(entry.sizeStr);
-                    break;
-            }
-        } else if (entry.size == ApplicationsState.SIZE_INVALID) {
-            summary.setText(invalidSizeStr);
-        }
-    }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/development/BugReportPreferenceControllerV2.java b/src/com/android/settings/development/BugReportPreferenceControllerV2.java
index 38dece8..5876f84 100644
--- a/src/com/android/settings/development/BugReportPreferenceControllerV2.java
+++ b/src/com/android/settings/development/BugReportPreferenceControllerV2.java
@@ -44,14 +44,4 @@
     public String getPreferenceKey() {
         return KEY_BUGREPORT;
     }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        // intentional no-op
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchDisabled() {
-        // intentional no-op
-    }
 }
diff --git a/src/com/android/settings/development/DevelopmentSettings.java b/src/com/android/settings/development/DevelopmentSettings.java
index 729864c..b492c1a 100644
--- a/src/com/android/settings/development/DevelopmentSettings.java
+++ b/src/com/android/settings/development/DevelopmentSettings.java
@@ -193,6 +193,8 @@
     private static final String BLUETOOTH_SELECT_A2DP_CHANNEL_MODE_KEY = "bluetooth_select_a2dp_channel_mode";
     private static final String BLUETOOTH_SELECT_A2DP_LDAC_PLAYBACK_QUALITY_KEY = "bluetooth_select_a2dp_ldac_playback_quality";
 
+    private static final String DNS_TLS_KEY = "dns_tls";
+
     private static final String INACTIVE_APPS_KEY = "inactive_apps";
 
     private static final String IMMEDIATELY_DESTROY_ACTIVITIES_KEY
@@ -271,6 +273,8 @@
     private ListPreference mBluetoothSelectA2dpChannelMode;
     private ListPreference mBluetoothSelectA2dpLdacPlaybackQuality;
 
+    private SwitchPreference mDnsTls;
+
     private SwitchPreference mOtaDisableAutomaticUpdate;
     private SwitchPreference mWifiAllowScansWithTraffic;
     private SwitchPreference mStrictMode;
@@ -491,6 +495,8 @@
         mBluetoothSelectA2dpLdacPlaybackQuality = addListPreference(BLUETOOTH_SELECT_A2DP_LDAC_PLAYBACK_QUALITY_KEY);
         initBluetoothConfigurationValues();
 
+        mDnsTls = findAndInitSwitchPref(DNS_TLS_KEY);
+
         mWindowAnimationScale = addListPreference(WINDOW_ANIMATION_SCALE_KEY);
         mTransitionAnimationScale = addListPreference(TRANSITION_ANIMATION_SCALE_KEY);
         mAnimatorDurationScale = addListPreference(ANIMATOR_DURATION_SCALE_KEY);
@@ -848,6 +854,8 @@
         updateBluetoothDisableAbsVolumeOptions();
         updateBluetoothEnableInbandRingingOptions();
         updateBluetoothA2dpConfigurationValues();
+        updateSwitchPreference(mDnsTls, Settings.Global.getInt(cr,
+                Settings.Global.DNS_TLS_DISABLED, 0) == 0);
     }
 
     private void resetDangerousOptions() {
@@ -2363,6 +2371,10 @@
             writeBluetoothDisableAbsVolumeOptions();
         } else if (preference == mBluetoothEnableInbandRinging) {
             writeBluetoothEnableInbandRingingOptions();
+        } else if (preference == mDnsTls) {
+            Settings.Global.putInt(getActivity().getContentResolver(),
+                    Settings.Global.DNS_TLS_DISABLED,
+                    mDnsTls.isChecked() ? 0 : 1);
         } else if (SHORTCUT_MANAGER_RESET_KEY.equals(preference.getKey())) {
             resetShortcutManagerThrottling();
         } else {
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index c80416b..fa89ba4 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -358,14 +358,11 @@
         controllers.add(new HdcpCheckingPreferenceController(context));
         controllers.add(new BluetoothSnoopLogPreferenceController(context));
         controllers.add(new OemUnlockPreferenceController(context, activity, fragment));
-        // running services
         controllers.add(new FileEncryptionPreferenceController(context));
         controllers.add(new PictureColorModePreferenceController(context, lifecycle));
         controllers.add(new WebViewAppPreferenceControllerV2(context));
         controllers.add(new CoolColorTemperaturePreferenceController(context));
         controllers.add(new DisableAutomaticUpdatesPreferenceController(context));
-        // system ui demo mode
-        // quick settings developer tiles
         controllers.add(new AdbPreferenceController(context, fragment));
         controllers.add(new ClearAdbKeysPreferenceController(context, fragment));
         controllers.add(new LocalTerminalPreferenceController(context));
@@ -380,7 +377,6 @@
         controllers.add(new ConnectivityMonitorPreferenceControllerV2(context));
         controllers.add(new CameraLaserSensorPreferenceControllerV2(context));
         controllers.add(new CameraHalHdrPlusPreferenceControllerV2(context));
-        // feature flags
         controllers.add(new WifiDisplayCertificationPreferenceController(context));
         controllers.add(new WifiVerboseLoggingPreferenceController(context));
         controllers.add(new WifiAggressiveHandoverPreferenceController(context));
@@ -411,7 +407,6 @@
         controllers.add(new TransitionAnimationScalePreferenceController(context));
         controllers.add(new AnimatorDurationScalePreferenceController(context));
         controllers.add(new SecondaryDisplayPreferenceController(context));
-        // smallest width
         controllers.add(new ForceGpuRenderingPreferenceController(context));
         controllers.add(new GpuViewUpdatesPreferenceController(context));
         controllers.add(new HardwareLayersUpdatesPreferenceController(context));
@@ -426,10 +421,8 @@
         controllers.add(new ProfileGpuRenderingPreferenceController(context));
         controllers.add(new KeepActivitiesPreferenceController(context));
         controllers.add(new BackgroundProcessLimitPreferenceController(context));
-        // background check
         controllers.add(new AppsNotRespondingPreferenceController(context));
         controllers.add(new NotificationChannelWarningsPreferenceController(context));
-        // inactive apps
         controllers.add(new AllowAppsOnExternalPreferenceController(context));
         controllers.add(new ResizableActivityPreferenceController(context));
         controllers.add(new FreeformWindowsPreferenceController(context));
diff --git a/src/com/android/settings/development/FileEncryptionPreferenceController.java b/src/com/android/settings/development/FileEncryptionPreferenceController.java
index 0a6b4fa..3249bcf 100644
--- a/src/com/android/settings/development/FileEncryptionPreferenceController.java
+++ b/src/com/android/settings/development/FileEncryptionPreferenceController.java
@@ -86,16 +86,6 @@
                 mContext.getResources().getString(R.string.convert_to_file_encryption_done));
     }
 
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        // intentional no-op
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchDisabled() {
-        // intentional no-op
-    }
-
     private IStorageManager getStorageManager() {
         try {
             return IStorageManager.Stub.asInterface(
diff --git a/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java b/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java
index e52b073..51690ff 100644
--- a/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java
+++ b/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java
@@ -55,16 +55,6 @@
         updatePasswordSummary(preference);
     }
 
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        // intentional no-op
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchDisabled() {
-        // intentional no-op
-    }
-
     private void updatePasswordSummary(Preference preference) {
         preference.setEnabled(isAdminUser() && mBackupManager != null);
         if (mBackupManager == null) {
diff --git a/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java b/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java
index 0ef2561..a0e6592 100644
--- a/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java
+++ b/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java
@@ -58,16 +58,6 @@
         return true;
     }
 
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        // intentional no-op
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchDisabled() {
-        // intentional no-op
-    }
-
     private void resetShortcutManagerThrottling() {
         if (mShortcutService == null) {
             return;
diff --git a/src/com/android/settings/development/WebViewAppPreferenceControllerV2.java b/src/com/android/settings/development/WebViewAppPreferenceControllerV2.java
index 87ddb81..d061281 100644
--- a/src/com/android/settings/development/WebViewAppPreferenceControllerV2.java
+++ b/src/com/android/settings/development/WebViewAppPreferenceControllerV2.java
@@ -85,7 +85,7 @@
     @VisibleForTesting
     DefaultAppInfo getDefaultAppInfo() {
         final PackageInfo currentPackage = mWebViewUpdateServiceWrapper.getCurrentWebViewPackage();
-        return new DefaultAppInfo(mPackageManager,
+        return new DefaultAppInfo(mContext, mPackageManager,
                 currentPackage == null ? null : currentPackage.applicationInfo);
     }
 
diff --git a/src/com/android/settings/display/AppGridView.java b/src/com/android/settings/display/AppGridView.java
index 2d52ef2..4b814d0 100644
--- a/src/com/android/settings/display/AppGridView.java
+++ b/src/com/android/settings/display/AppGridView.java
@@ -16,20 +16,23 @@
 
 package com.android.settings.display;
 
-import com.android.settings.R;
-
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.graphics.drawable.Drawable;
+import android.os.UserHandle;
+import android.support.annotation.VisibleForTesting;
 import android.util.AttributeSet;
+import android.util.IconDrawableFactory;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.GridView;
 import android.widget.ImageView;
 
+import com.android.settings.R;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -63,7 +66,8 @@
     /**
      * Loads application labels and icons.
      */
-    private static class AppsAdapter extends ArrayAdapter<ActivityEntry> {
+    @VisibleForTesting
+    public static class AppsAdapter extends ArrayAdapter<ActivityEntry> {
         private final PackageManager mPackageManager;
         private final int mIconResId;
 
@@ -80,9 +84,8 @@
         public View getView(int position, View convertView, ViewGroup parent) {
             final View view = super.getView(position, convertView, parent);
             final ActivityEntry entry = getItem(position);
-            final ImageView iconView = (ImageView) view.findViewById(mIconResId);
-            final Drawable icon = entry.info.loadIcon(mPackageManager);
-            iconView.setImageDrawable(icon);
+            final ImageView iconView = view.findViewById(mIconResId);
+            iconView.setImageDrawable(entry.getIcon());
             return view;
         }
 
@@ -108,10 +111,11 @@
             final PackageManager pm = mPackageManager;
             final ArrayList<ActivityEntry> results = new ArrayList<>();
             final List<ResolveInfo> infos = pm.queryIntentActivities(mainIntent, 0);
+            final IconDrawableFactory iconFactory = IconDrawableFactory.newInstance(getContext());
             for (ResolveInfo info : infos) {
                 final CharSequence label = info.loadLabel(pm);
                 if (label != null) {
-                    results.add(new ActivityEntry(info, label.toString()));
+                    results.add(new ActivityEntry(info, label.toString(), iconFactory));
                 }
             }
 
@@ -124,13 +128,19 @@
     /**
      * Class used for caching the activity label and icon.
      */
-    private static class ActivityEntry implements Comparable<ActivityEntry> {
+    @VisibleForTesting
+    public static class ActivityEntry implements Comparable<ActivityEntry> {
+
         public final ResolveInfo info;
         public final String label;
+        private final IconDrawableFactory mIconFactory;
+        private final int mUserId;
 
-        public ActivityEntry(ResolveInfo info, String label) {
+        public ActivityEntry(ResolveInfo info, String label, IconDrawableFactory iconFactory) {
             this.info = info;
             this.label = label;
+            mIconFactory = iconFactory;
+            mUserId = UserHandle.myUserId();
         }
 
         @Override
@@ -142,5 +152,10 @@
         public String toString() {
             return label;
         }
+
+        public Drawable getIcon() {
+            return mIconFactory.getBadgedIcon(
+                    info.activityInfo, info.activityInfo.applicationInfo, mUserId);
+        }
     }
 }
diff --git a/src/com/android/settings/enterprise/ApplicationListPreferenceController.java b/src/com/android/settings/enterprise/ApplicationListPreferenceController.java
index eee9b33..dce6f57 100644
--- a/src/com/android/settings/enterprise/ApplicationListPreferenceController.java
+++ b/src/com/android/settings/enterprise/ApplicationListPreferenceController.java
@@ -20,6 +20,7 @@
 import android.content.pm.PackageManager;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
+import android.util.IconDrawableFactory;
 
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
@@ -63,13 +64,14 @@
         if (screen == null) {
             return;
         }
+        final IconDrawableFactory iconDrawableFactory = IconDrawableFactory.newInstance(mContext);
         final Context prefContext = mParent.getPreferenceManager().getContext();
         for (int position = 0; position < result.size(); position++) {
             final UserAppInfo item = result.get(position);
             final Preference preference = new Preference(prefContext);
             preference.setLayoutResource(R.layout.preference_app);
             preference.setTitle(item.appInfo.loadLabel(mPm));
-            preference.setIcon(item.appInfo.loadIcon(mPm));
+            preference.setIcon(iconDrawableFactory.getBadgedIcon(item.appInfo));
             preference.setOrder(position);
             preference.setSelectable(false);
             screen.addPreference(preference);
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
index 66a9948..10bc9e3 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
@@ -165,22 +165,6 @@
         startIconAnimation();
     }
 
-    @Override
-    protected void onResume() {
-        super.onResume();
-        if (mSidecar != null) {
-            mSidecar.setListener(this);
-        }
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        if (mSidecar != null) {
-            mSidecar.setListener(null);
-        }
-    }
-
     private void startIconAnimation() {
         mIconAnimationDrawable.start();
     }
diff --git a/src/com/android/settings/search/AccessibilityServiceResultLoader.java b/src/com/android/settings/search/AccessibilityServiceResultLoader.java
index 7ffbcfc..64cceb7 100644
--- a/src/com/android/settings/search/AccessibilityServiceResultLoader.java
+++ b/src/com/android/settings/search/AccessibilityServiceResultLoader.java
@@ -26,8 +26,10 @@
 import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
 import android.graphics.drawable.Drawable;
+import android.os.UserHandle;
 import android.support.annotation.VisibleForTesting;
 import android.support.v4.content.ContextCompat;
+import android.util.IconDrawableFactory;
 import android.view.accessibility.AccessibilityManager;
 
 import com.android.settings.R;
@@ -44,17 +46,22 @@
 
     private static final int NAME_NO_MATCH = -1;
 
+    private final Context mContext;
+
     private List<String> mBreadcrumb;
     private SiteMapManager mSiteMapManager;
     @VisibleForTesting
     final String mQuery;
     private final AccessibilityManager mAccessibilityManager;
     private final PackageManager mPackageManager;
+    private final int mUserId;
 
 
     public AccessibilityServiceResultLoader(Context context, String query,
             SiteMapManager mapManager) {
         super(context);
+        mContext = context;
+        mUserId = UserHandle.myUserId();
         mSiteMapManager = mapManager;
         mPackageManager = context.getPackageManager();
         mAccessibilityManager =
@@ -68,6 +75,7 @@
         final Context context = getContext();
         final List<AccessibilityServiceInfo> services = mAccessibilityManager
                 .getInstalledAccessibilityServiceList();
+        final IconDrawableFactory iconFactory = IconDrawableFactory.newInstance(mContext);
         final String screenTitle = context.getString(R.string.accessibility_settings);
         for (AccessibilityServiceInfo service : services) {
             if (service == null) {
@@ -87,7 +95,10 @@
             if (resolveInfo.getIconResource() == 0) {
                 icon = ContextCompat.getDrawable(context, R.mipmap.ic_accessibility_generic);
             } else {
-                icon = resolveInfo.loadIcon(mPackageManager);
+                icon = iconFactory.getBadgedIcon(
+                        resolveInfo.serviceInfo,
+                        resolveInfo.serviceInfo.applicationInfo,
+                        mUserId);
             }
             final String componentName = new ComponentName(serviceInfo.packageName,
                     serviceInfo.name).flattenToString();
diff --git a/src/com/android/settings/search/SearchFragment.java b/src/com/android/settings/search/SearchFragment.java
index 092404c..ca951c6 100644
--- a/src/com/android/settings/search/SearchFragment.java
+++ b/src/com/android/settings/search/SearchFragment.java
@@ -75,7 +75,6 @@
     private static final String STATE_QUERY = "state_query";
     private static final String STATE_SHOWING_SAVED_QUERY = "state_showing_saved_query";
     private static final String STATE_NEVER_ENTERED_QUERY = "state_never_entered_query";
-    private static final String STATE_RESULT_CLICK_COUNT = "state_result_click_count";
 
     static final class SearchLoaderId {
         // Search Query IDs
@@ -96,17 +95,12 @@
     @VisibleForTesting
     AtomicInteger mUnfinishedLoadersCount = new AtomicInteger(NUM_QUERY_LOADERS);
 
-    // Logging
-    @VisibleForTesting
-    static final String RESULT_CLICK_COUNT = "settings_search_result_click_count";
-
     @VisibleForTesting
     String mQuery;
 
     private boolean mNeverEnteredQuery = true;
     @VisibleForTesting
     boolean mShowingSavedQuery;
-    private int mResultClickCount;
     private MetricsFeatureProvider mMetricsFeatureProvider;
     @VisibleForTesting
     SavedQueryController mSavedQueryController;
@@ -161,7 +155,6 @@
         if (savedInstanceState != null) {
             mQuery = savedInstanceState.getString(STATE_QUERY);
             mNeverEnteredQuery = savedInstanceState.getBoolean(STATE_NEVER_ENTERED_QUERY);
-            mResultClickCount = savedInstanceState.getInt(STATE_RESULT_CLICK_COUNT);
             mShowingSavedQuery = savedInstanceState.getBoolean(STATE_SHOWING_SAVED_QUERY);
         } else {
             mShowingSavedQuery = true;
@@ -244,7 +237,6 @@
         super.onStop();
         final Activity activity = getActivity();
         if (activity != null && activity.isFinishing()) {
-            mMetricsFeatureProvider.histogram(activity, RESULT_CLICK_COUNT, mResultClickCount);
             if (mNeverEnteredQuery) {
                 mMetricsFeatureProvider.action(activity,
                         MetricsEvent.ACTION_LEAVE_SEARCH_RESULT_WITHOUT_QUERY);
@@ -258,7 +250,6 @@
         outState.putString(STATE_QUERY, mQuery);
         outState.putBoolean(STATE_NEVER_ENTERED_QUERY, mNeverEnteredQuery);
         outState.putBoolean(STATE_SHOWING_SAVED_QUERY, mShowingSavedQuery);
-        outState.putInt(STATE_RESULT_CLICK_COUNT, mResultClickCount);
     }
 
     @Override
@@ -276,7 +267,6 @@
             mNoResultsView.setVisibility(View.GONE);
         }
 
-        mResultClickCount = 0;
         mNeverEnteredQuery = false;
         mQuery = query;
 
@@ -335,7 +325,6 @@
         if (mUnfinishedLoadersCount.decrementAndGet() != 0) {
             return;
         }
-
         mSearchAdapter.notifyResultsLoaded();
     }
 
@@ -372,7 +361,6 @@
         logSearchResultClicked(resultViewHolder, result, logTaggedData);
         mSearchFeatureProvider.searchResultClicked(getContext(), mQuery, result);
         mSavedQueryController.saveQuery(mQuery);
-        mResultClickCount++;
     }
 
     public void onSearchResultsDisplayed(int resultCount) {
@@ -384,6 +372,8 @@
             mNoResultsView.setVisibility(View.GONE);
             mResultsRecyclerView.scrollToPosition(0);
         }
+        mMetricsFeatureProvider.action(
+                getVisibilityLogger(), MetricsEvent.ACTION_SEARCH_RESULTS, 1);
         mSearchFeatureProvider.showFeedbackButton(this, getView());
     }
 
diff --git a/src/com/android/settings/webview/WebViewAppPicker.java b/src/com/android/settings/webview/WebViewAppPicker.java
index 362ca1f..536cd8b 100644
--- a/src/com/android/settings/webview/WebViewAppPicker.java
+++ b/src/com/android/settings/webview/WebViewAppPicker.java
@@ -60,12 +60,13 @@
     @Override
     protected List<DefaultAppInfo> getCandidates() {
         final List<DefaultAppInfo> packageInfoList = new ArrayList<DefaultAppInfo>();
-        List<ApplicationInfo> pkgs =
-                getWebViewUpdateServiceWrapper().getValidWebViewApplicationInfos(getContext());
+        final Context context = getContext();
+        final WebViewUpdateServiceWrapper webViewUpdateService = getWebViewUpdateServiceWrapper();
+        final List<ApplicationInfo> pkgs =
+                webViewUpdateService.getValidWebViewApplicationInfos(context);
         for (ApplicationInfo ai : pkgs) {
-            packageInfoList.add(createDefaultAppInfo(mPm, ai,
-                    getDisabledReason(getWebViewUpdateServiceWrapper(),
-                            getContext(), ai.packageName)));
+            packageInfoList.add(createDefaultAppInfo(context, mPm, ai,
+                    getDisabledReason(webViewUpdateService, context, ai.packageName)));
         }
         return packageInfoList;
     }
@@ -112,9 +113,9 @@
     }
 
     private static class WebViewAppInfo extends DefaultAppInfo {
-        public WebViewAppInfo(PackageManagerWrapper pm, PackageItemInfo packageItemInfo,
-                String summary, boolean enabled) {
-            super(pm, packageItemInfo, summary, enabled);
+        public WebViewAppInfo(Context context, PackageManagerWrapper pm,
+                PackageItemInfo packageItemInfo, String summary, boolean enabled) {
+            super(context, pm, packageItemInfo, summary, enabled);
         }
 
         @Override
@@ -131,9 +132,9 @@
 
 
     @VisibleForTesting
-    DefaultAppInfo createDefaultAppInfo(PackageManagerWrapper pm, PackageItemInfo packageItemInfo,
-            String disabledReason) {
-        return new WebViewAppInfo(pm, packageItemInfo, disabledReason,
+    DefaultAppInfo createDefaultAppInfo(Context context, PackageManagerWrapper pm,
+            PackageItemInfo packageItemInfo, String disabledReason) {
+        return new WebViewAppInfo(context, pm, packageItemInfo, disabledReason,
                 TextUtils.isEmpty(disabledReason) /* enabled */);
     }
 
diff --git a/src/com/android/settings/webview/WebViewAppPreferenceController.java b/src/com/android/settings/webview/WebViewAppPreferenceController.java
index 96db801..9410af7 100644
--- a/src/com/android/settings/webview/WebViewAppPreferenceController.java
+++ b/src/com/android/settings/webview/WebViewAppPreferenceController.java
@@ -46,7 +46,7 @@
     @Override
     public DefaultAppInfo getDefaultAppInfo() {
         PackageInfo currentPackage = mWebViewUpdateServiceWrapper.getCurrentWebViewPackage();
-        return new DefaultAppInfo(mPackageManager,
+        return new DefaultAppInfo(mContext, mPackageManager,
                 currentPackage == null ? null : currentPackage.applicationInfo);
     }
 
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppInfoTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppInfoTest.java
index 0ae9615..d4cd6da 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppInfoTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppInfoTest.java
@@ -21,11 +21,13 @@
 import static org.mockito.Mockito.when;
 
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.pm.PackageItemInfo;
 import android.content.pm.PackageManager;
+import android.graphics.drawable.Drawable;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import org.junit.Before;
@@ -33,6 +35,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
@@ -48,31 +51,33 @@
     @Mock
     private PackageManagerWrapper mPackageManagerWrapper;
 
+    private Context mContext;
     private DefaultAppInfo mInfo;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
         when(mPackageManagerWrapper.getPackageManager()).thenReturn(mPackageManager);
     }
 
     @Test
     public void initInfoWithActivityInfo_shouldLoadInfo() {
         mPackageItemInfo.packageName = "test";
-        mInfo = new DefaultAppInfo(mPackageManagerWrapper, mPackageItemInfo);
+        mInfo = new DefaultAppInfo(mContext, mPackageManagerWrapper, mPackageItemInfo);
         mInfo.loadLabel();
-        mInfo.loadIcon();
+        Drawable icon = mInfo.loadIcon();
 
         assertThat(mInfo.getKey()).isEqualTo(mPackageItemInfo.packageName);
+        assertThat(icon).isNotNull();
         verify(mPackageItemInfo).loadLabel(mPackageManager);
-        verify(mPackageItemInfo).loadIcon(mPackageManager);
     }
 
     @Test
     public void initInfoWithComponent_shouldLoadInfo() {
         when(mComponentName.getPackageName()).thenReturn("com.android.settings");
 
-        mInfo = new DefaultAppInfo(mPackageManagerWrapper, 0 /* uid */, mComponentName);
+        mInfo = new DefaultAppInfo(mContext, mPackageManagerWrapper, 0 /* uid */, mComponentName);
         mInfo.getKey();
 
         verify(mComponentName).flattenToString();
diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java
new file mode 100644
index 0000000..cf2403b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.manageapplications;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.FrameLayout;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.applications.ApplicationsState;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class ApplicationViewHolderTest {
+
+    private Context mContext;
+    private View mView;
+    private ApplicationViewHolder mHolder;
+
+    @Before
+    public void seUp() {
+        mContext = RuntimeEnvironment.application;
+        mView = ApplicationViewHolder.newView(LayoutInflater.from(mContext),
+                new FrameLayout(mContext));
+        mHolder = new ApplicationViewHolder(mView);
+    }
+
+    @Test
+    public void updateDisableView_appDisabledUntilUsed_shouldSetDisabled() {
+        final ApplicationInfo info = new ApplicationInfo();
+        info.flags = ApplicationInfo.FLAG_INSTALLED;
+        info.enabled = true;
+        info.enabledSetting = PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED;
+        mHolder.updateDisableView(info);
+
+        assertThat(mHolder.mDisabled.getText()).isEqualTo(mContext.getText(R.string.disabled));
+    }
+
+    @Test
+    public void setSummaries() {
+        mHolder.setSummary("hello");
+        assertThat(mHolder.mSummary.getText()).isEqualTo("hello");
+
+        mHolder.setSummary(R.string.disabled);
+        assertThat(mHolder.mSummary.getText()).isEqualTo(mContext.getText(R.string.disabled));
+    }
+
+    @Test
+    public void updateSize() {
+        final String invalidStr = "invalid";
+        final ApplicationsState.AppEntry entry = mock(ApplicationsState.AppEntry.class);
+        entry.internalSizeStr = "internal";
+        entry.externalSizeStr = "external";
+        entry.sizeStr = entry.internalSizeStr;
+
+        mHolder.updateSizeText(entry, invalidStr, ManageApplications.SIZE_INTERNAL);
+        assertThat(mHolder.mSummary.getText()).isEqualTo(entry.internalSizeStr);
+
+        mHolder.updateSizeText(entry, invalidStr, ManageApplications.SIZE_EXTERNAL);
+        assertThat(mHolder.mSummary.getText()).isEqualTo(entry.externalSizeStr);
+
+        entry.sizeStr = null;
+        entry.size = ApplicationsState.SIZE_INVALID;
+        mHolder.updateSizeText(entry, invalidStr, ManageApplications.SIZE_EXTERNAL);
+        assertThat(mHolder.mSummary.getText()).isEqualTo(invalidStr);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java
index 9afaf1f..9eb36ef 100644
--- a/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java
@@ -31,19 +31,16 @@
 
 import android.app.Activity;
 import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.os.Handler;
+import android.os.Bundle;
 import android.os.Looper;
+import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;
 
 import com.android.settings.R;
-import com.android.settings.Settings;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
@@ -103,30 +100,6 @@
     }
 
     @Test
-    public void launchFragment() {
-        SettingsRobolectricTestRunner.startSettingsFragment(
-                mFragment, Settings.ManageApplicationsActivity.class);
-    }
-
-    @Test
-    public void updateDisableView_appDisabledUntilUsed_shouldSetDisabled() {
-        final TextView view = mock(TextView.class);
-        final ApplicationInfo info = new ApplicationInfo();
-        info.flags = ApplicationInfo.FLAG_INSTALLED;
-        info.enabled = true;
-        info.enabledSetting = PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED;
-        ManageApplications fragment = mock(ManageApplications.class);
-        when(fragment.getActivity()).thenReturn(mock(Activity.class));
-        final ManageApplications.ApplicationsAdapter adapter =
-                new ManageApplications.ApplicationsAdapter(mState, fragment,
-                        AppFilterRegistry.getInstance().get(FILTER_APPS_ALL));
-
-        adapter.updateDisableView(view, info);
-
-        verify(view).setText(R.string.disabled);
-    }
-
-    @Test
     public void updateMenu_mainListType_showAppReset() {
         setUpOptionMenus();
         ReflectionHelpers.setField(mFragment, "mListType", ManageApplications.LIST_TYPE_MAIN);
@@ -170,14 +143,12 @@
         ReflectionHelpers.setField(fragment, "mLoadingContainer", mock(View.class));
         ReflectionHelpers.setField(fragment, "mListContainer", mock(View.class));
         when(fragment.getActivity()).thenReturn(mock(Activity.class));
-        final Handler handler = mock(Handler.class);
         final ManageApplications.ApplicationsAdapter adapter =
-            spy(new ManageApplications.ApplicationsAdapter(mState, fragment,
-                    AppFilterRegistry.getInstance().get(FILTER_APPS_ALL)));
+                spy(new ManageApplications.ApplicationsAdapter(mState, fragment,
+                        AppFilterRegistry.getInstance().get(FILTER_APPS_ALL), new Bundle()));
         final LoadingViewController loadingViewController =
                 mock(LoadingViewController.class);
         ReflectionHelpers.setField(adapter, "mLoadingViewController", loadingViewController);
-        ReflectionHelpers.setField(adapter, "mFgHandler", handler);
 
         // app loading completed
         ReflectionHelpers.setField(adapter, "mHasReceivedLoadEntries", true);
@@ -196,15 +167,12 @@
         ReflectionHelpers.setField(fragment, "mLoadingContainer", mock(View.class));
         ReflectionHelpers.setField(fragment, "mListContainer", mock(View.class));
         when(fragment.getActivity()).thenReturn(mock(Activity.class));
-
-        final Handler handler = mock(Handler.class);
         final ManageApplications.ApplicationsAdapter adapter =
-            spy(new ManageApplications.ApplicationsAdapter(mState, fragment,
-                    AppFilterRegistry.getInstance().get(FILTER_APPS_ALL)));
+                spy(new ManageApplications.ApplicationsAdapter(mState, fragment,
+                        AppFilterRegistry.getInstance().get(FILTER_APPS_ALL), new Bundle()));
         final LoadingViewController loadingViewController =
                 mock(LoadingViewController.class);
         ReflectionHelpers.setField(adapter, "mLoadingViewController", loadingViewController);
-        ReflectionHelpers.setField(adapter, "mFgHandler", handler);
 
         // app loading not yet completed
         ReflectionHelpers.setField(adapter, "mHasReceivedLoadEntries", false);
@@ -218,6 +186,10 @@
     public void onRebuildComplete_shouldHideLoadingView() {
         final Context context = RuntimeEnvironment.application;
         final ManageApplications fragment = mock(ManageApplications.class);
+        final RecyclerView recyclerView = mock(RecyclerView.class);
+        final View emptyView = mock(View.class);
+        ReflectionHelpers.setField(fragment, "mRecyclerView", recyclerView);
+        ReflectionHelpers.setField(fragment, "mEmptyView", emptyView);
         final View loadingContainer = mock(View.class);
         when(loadingContainer.getContext()).thenReturn(context);
         final View listContainer = mock(View.class);
@@ -226,14 +198,12 @@
         ReflectionHelpers.setField(fragment, "mLoadingContainer", loadingContainer);
         ReflectionHelpers.setField(fragment, "mListContainer", listContainer);
         when(fragment.getActivity()).thenReturn(mock(Activity.class));
-        final Handler handler = mock(Handler.class);
         final ManageApplications.ApplicationsAdapter adapter =
-            spy(new ManageApplications.ApplicationsAdapter(mState, fragment,
-                    AppFilterRegistry.getInstance().get(FILTER_APPS_ALL)));
+                spy(new ManageApplications.ApplicationsAdapter(mState, fragment,
+                        AppFilterRegistry.getInstance().get(FILTER_APPS_ALL), new Bundle()));
         final LoadingViewController loadingViewController =
                 mock(LoadingViewController.class);
         ReflectionHelpers.setField(adapter, "mLoadingViewController", loadingViewController);
-        ReflectionHelpers.setField(adapter, "mFgHandler", handler);
         ReflectionHelpers.setField(adapter, "mAppFilter",
                 AppFilterRegistry.getInstance().get(FILTER_APPS_ALL));
 
diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java
index 46a059a..28ac9d9 100644
--- a/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java
@@ -28,11 +28,12 @@
 import android.os.storage.VolumeInfo;
 import android.provider.DocumentsContract;
 import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.FrameLayout;
 
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.applications.StorageStatsSource;
-import com.android.settingslib.deviceinfo.StorageVolumeProvider;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -51,14 +52,13 @@
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Fragment mFragment;
     @Mock
-    private StorageVolumeProvider mSvp;
-    @Mock
     private StorageStatsSource mSource;
 
     private Context mContext;
     private MusicViewHolderController mController;
     private VolumeInfo mVolume;
-    private AppViewHolder mHolder;
+    private View mView;
+    private ApplicationViewHolder mHolder;
 
     @Before
     public void setUp() throws Exception {
@@ -69,25 +69,26 @@
                 new UserHandle(0));
 
         LayoutInflater inflater = LayoutInflater.from(mContext);
-        mHolder = AppViewHolder.createOrRecycle(inflater, null);
+        mView = ApplicationViewHolder.newView(inflater, new FrameLayout(mContext));
+        mHolder = new ApplicationViewHolder(mView);
     }
 
     @Test
     public void storageShouldBeZeroBytesIfQueriedBeforeStorageQueryFinishes() {
         mController.setupView(mHolder);
 
-        assertThat(mHolder.summary.getText().toString()).isEqualTo("0.00 B");
+        assertThat(mHolder.mSummary.getText().toString()).isEqualTo("0.00 B");
     }
 
     @Test
     public void storageShouldRepresentStorageStatsQuery() throws Exception {
-        when(mSource.getExternalStorageStats(nullable(String.class), nullable(UserHandle.class))).thenReturn(
-                new StorageStatsSource.ExternalStorageStats(1, 1, 0, 0, 0));
+        when(mSource.getExternalStorageStats(nullable(String.class), nullable(UserHandle.class)))
+                .thenReturn(new StorageStatsSource.ExternalStorageStats(1, 1, 0, 0, 0));
 
         mController.queryStats();
         mController.setupView(mHolder);
 
-        assertThat(mHolder.summary.getText().toString()).isEqualTo("1.00 B");
+        assertThat(mHolder.mSummary.getText().toString()).isEqualTo("1.00 B");
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java
index a051ac3..2a26e31 100644
--- a/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java
@@ -27,11 +27,12 @@
 import android.os.UserHandle;
 import android.os.storage.VolumeInfo;
 import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.FrameLayout;
 
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.applications.StorageStatsSource;
-import com.android.settingslib.deviceinfo.StorageVolumeProvider;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -48,14 +49,14 @@
 public class PhotosViewHolderControllerTest {
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Fragment mFragment;
-
-    @Mock private StorageVolumeProvider mSvp;
     @Mock private StorageStatsSource mSource;
 
     private Context mContext;
     private PhotosViewHolderController mController;
     private VolumeInfo mVolume;
-    private AppViewHolder mHolder;
+    private View mView;
+    private ApplicationViewHolder mHolder;
+
 
     @Before
     public void setUp() throws Exception {
@@ -66,15 +67,16 @@
                 new PhotosViewHolderController(
                         mContext, mSource, mVolume.fsUuid, new UserHandle(0));
 
-        LayoutInflater inflater = LayoutInflater.from(mContext);
-        mHolder = AppViewHolder.createOrRecycle(inflater, null);
+        final LayoutInflater inflater = LayoutInflater.from(mContext);
+        mView = ApplicationViewHolder.newView(inflater, new FrameLayout(mContext));
+        mHolder = new ApplicationViewHolder(mView);
     }
 
     @Test
     public void storageShouldBeZeroBytesIfQueriedBeforeStorageQueryFinishes() {
         mController.setupView(mHolder);
 
-        assertThat(mHolder.summary.getText().toString()).isEqualTo("0.00 B");
+        assertThat(mHolder.mSummary.getText().toString()).isEqualTo("0.00 B");
     }
 
     @Test
@@ -85,7 +87,7 @@
         mController.queryStats();
         mController.setupView(mHolder);
 
-        assertThat(mHolder.summary.getText().toString()).isEqualTo("11.00 B");
+        assertThat(mHolder.mSummary.getText().toString()).isEqualTo("11.00 B");
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java b/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java
index 843c753..ada59f4 100644
--- a/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java
@@ -66,7 +66,8 @@
     public void onResume_shouldRegisterIntentFilter() {
         mMixin.onResume();
         mContext.sendBroadcast(new Intent(Intent.ACTION_TIME_TICK));
-        mContext.sendBroadcast(new Intent(Intent.ACTION_TIME_CHANGED));
+        mContext.sendBroadcast(new Intent(Intent.ACTION_TIME_CHANGED)
+                .addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND));
         mContext.sendBroadcast(new Intent(Intent.ACTION_TIMEZONE_CHANGED));
 
         verify(mCallback, times(3)).updateTimeAndDateDisplay(mContext);
@@ -77,7 +78,8 @@
         mMixin.onResume();
         mMixin.onPause();
         mContext.sendBroadcast(new Intent(Intent.ACTION_TIME_TICK));
-        mContext.sendBroadcast(new Intent(Intent.ACTION_TIME_CHANGED));
+        mContext.sendBroadcast(new Intent(Intent.ACTION_TIME_CHANGED)
+                .addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND));
         mContext.sendBroadcast(new Intent(Intent.ACTION_TIMEZONE_CHANGED));
 
         verify(mCallback, never()).updateTimeAndDateDisplay(mContext);
diff --git a/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java
index b2731ea..40e2fbd 100644
--- a/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java
@@ -90,17 +90,17 @@
     public void onPreferenceChange_preferenceChecked_shouldEnableShowTaps() {
         mController.onPreferenceChange(mPreference, true /* new value */);
 
-        int showTapsMode = Settings.System.getInt(mContext.getContentResolver(),
+        final int showTapsMode = Settings.System.getInt(mContext.getContentResolver(),
                 Settings.System.SHOW_TOUCHES, -1 /* default */);
 
         assertThat(showTapsMode).isEqualTo(ShowTapsPreferenceController.SETTING_VALUE_ON);
     }
 
     @Test
-    public void onPreferenceChange__preferenceUnchecked_shouldDisableCameraLaserSensor() {
+    public void onPreferenceChange__preferenceUnchecked_shouldDisableShowTaps() {
         mController.onPreferenceChange(mPreference, false /* new value */);
 
-        int showTapsMode = Settings.System.getInt(mContext.getContentResolver(),
+        final int showTapsMode = Settings.System.getInt(mContext.getContentResolver(),
                 Settings.System.SHOW_TOUCHES, -1 /* default */);
 
         assertThat(showTapsMode).isEqualTo(ShowTapsPreferenceController.SETTING_VALUE_OFF);
@@ -117,7 +117,7 @@
     public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeEnabled() {
         mController.onDeveloperOptionsSwitchDisabled();
 
-        int showTapsMode = Settings.System.getInt(mContext.getContentResolver(),
+        final int showTapsMode = Settings.System.getInt(mContext.getContentResolver(),
                 Settings.System.SHOW_TOUCHES, -1 /* default */);
 
         assertThat(showTapsMode).isEqualTo(ShowTapsPreferenceController.SETTING_VALUE_OFF);
diff --git a/tests/robotests/src/com/android/settings/display/AppGridViewTest.java b/tests/robotests/src/com/android/settings/display/AppGridViewTest.java
new file mode 100644
index 0000000..d0a92c9
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/AppGridViewTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.display;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ResolveInfo;
+import android.util.IconDrawableFactory;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class AppGridViewTest {
+
+    @Mock
+    private ResolveInfo mInfo;
+    @Mock
+    private ActivityInfo mActivityInfo;
+    private Context mContext;
+    private IconDrawableFactory mIconFactory;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mInfo.activityInfo = mActivityInfo;
+        mContext = RuntimeEnvironment.application;
+        mIconFactory = IconDrawableFactory.newInstance(mContext);
+    }
+
+    @Test
+    public void appEntry_shouldLoadIcon() {
+
+        final AppGridView.ActivityEntry activityEntry = new AppGridView.ActivityEntry(
+                mInfo, "label", mIconFactory);
+
+        assertThat(activityEntry.label).isEqualTo("label");
+        assertThat(activityEntry.getIcon()).isNotNull();
+    }
+
+    @Test
+    public void appEntry_compare_shouldCompareIgnoreCase() {
+        final AppGridView.ActivityEntry entry1 = new AppGridView.ActivityEntry(
+                mInfo, "label", mIconFactory);
+        final AppGridView.ActivityEntry entry2 = new AppGridView.ActivityEntry(
+                mInfo, "LABEL", mIconFactory);
+        final AppGridView.ActivityEntry entry3 = new AppGridView.ActivityEntry(
+                mInfo, "label2", mIconFactory);
+
+        assertThat(entry1.compareTo(entry2)).isEqualTo(0);
+        assertThat(entry1.compareTo(entry3)).isNotEqualTo(0);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java b/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java
index 4976c6a..b897008 100644
--- a/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java
@@ -43,6 +43,7 @@
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.TestConfig;
+import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
 import com.android.settings.testutils.DatabaseTestUtils;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -207,8 +208,6 @@
         verify(mFeatureFactory.metricsFeatureProvider, never()).action(
                 any(Context.class),
                 eq(MetricsProto.MetricsEvent.ACTION_LEAVE_SEARCH_RESULT_WITHOUT_QUERY));
-        verify(mFeatureFactory.metricsFeatureProvider).histogram(
-                any(Context.class), eq(SearchFragment.RESULT_CLICK_COUNT), eq(0));
         verify(mFeatureFactory.searchFeatureProvider)
                 .getDatabaseSearchLoader(any(Context.class), anyString());
         verify(mFeatureFactory.searchFeatureProvider)
@@ -231,6 +230,10 @@
                 any(Context.class),
                 anyInt(),
                 eq(MetricsProto.MetricsEvent.SETTINGS_SEARCH_NO_RESULT));
+        verify(mFeatureFactory.metricsFeatureProvider).action(
+                any(VisibilityLoggerMixin.class),
+                eq(MetricsProto.MetricsEvent.ACTION_SEARCH_RESULTS),
+                eq(1));
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
index 73d001a..470b69c 100644
--- a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
+++ b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
@@ -16,38 +16,6 @@
 
 package com.android.settings.webview;
 
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageItemInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.UserInfo;
-import android.os.UserManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.defaultapps.DefaultAppInfo;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.widget.RadioButtonPreference;
-import com.android.settings.wrapper.UserPackageWrapper;
-import com.android.settingslib.wrapper.PackageManagerWrapper;
-
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.Arrays;
-
 import static android.provider.Settings.ACTION_WEBVIEW_SETTINGS;
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.any;
@@ -62,22 +30,47 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageItemInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.UserInfo;
+import android.os.UserManager;
+
+import com.android.settings.TestConfig;
+import com.android.settings.applications.defaultapps.DefaultAppInfo;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.widget.RadioButtonPreference;
+import com.android.settings.wrapper.UserPackageWrapper;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.Arrays;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class WebViewAppPickerTest {
     private Context mContext = RuntimeEnvironment.application;
 
-    private static UserInfo sFirstUser;
-    private static UserInfo sSecondUser;
+    private UserInfo mFirstUser;
+    private UserInfo mSecondUser;
 
     private final static String DEFAULT_PACKAGE_NAME = "DEFAULT_PACKAGE_NAME";
 
-    @BeforeClass
-    public static void beforeClass() {
-        sFirstUser = new UserInfo(0, "FIRST_USER", 0);
-        sSecondUser = new UserInfo(0, "SECOND_USER", 0);
-    }
-
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Activity mActivity;
     @Mock
@@ -99,7 +92,8 @@
         MockitoAnnotations.initMocks(this);
         FakeFeatureFactory.setupForTest(mActivity);
         when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-
+        mFirstUser = new UserInfo(0, "FIRST_USER", 0);
+        mSecondUser = new UserInfo(0, "SECOND_USER", 0);
         mPicker = new WebViewAppPicker();
         mPicker = spy(mPicker);
         doNothing().when(mPicker).updateCandidates();
@@ -174,7 +168,7 @@
     @Test
     public void testDisabledPackageShownAsDisabled() {
         String disabledReason = "disabled";
-        DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mPackageManager,
+        DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mActivity, mPackageManager,
                 createApplicationInfo(DEFAULT_PACKAGE_NAME), disabledReason);
 
         RadioButtonPreference mockPreference = mock(RadioButtonPreference.class);
@@ -189,7 +183,7 @@
     @Test
     public void testEnabledPackageShownAsEnabled() {
         String disabledReason = "";
-        DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mPackageManager,
+        DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mActivity, mPackageManager,
                 createApplicationInfo(DEFAULT_PACKAGE_NAME), disabledReason);
 
         RadioButtonPreference mockPreference = mock(RadioButtonPreference.class);
@@ -204,7 +198,7 @@
     @Test
     public void testDisabledPackageShowsDisabledReasonSummary() {
         String disabledReason = "disabled";
-        DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mPackageManager,
+        DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mActivity, mPackageManager,
                 createApplicationInfo(DEFAULT_PACKAGE_NAME), disabledReason);
 
         RadioButtonPreference mockPreference = mock(RadioButtonPreference.class);
@@ -220,7 +214,7 @@
     @Test
     public void testEnabledPackageShowsEmptySummary() {
         String disabledReason = null;
-        DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mPackageManager,
+        DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mActivity, mPackageManager,
                 createApplicationInfo(DEFAULT_PACKAGE_NAME), disabledReason);
 
         RadioButtonPreference mockPreference = mock(RadioButtonPreference.class);
@@ -268,14 +262,14 @@
         UserPackageWrapper packageForFirstUser = mock(UserPackageWrapper.class);
         when(packageForFirstUser.isEnabledPackage()).thenReturn(false);
         when(packageForFirstUser.isInstalledPackage()).thenReturn(true);
-        when(packageForFirstUser.getUserInfo()).thenReturn(sFirstUser);
+        when(packageForFirstUser.getUserInfo()).thenReturn(mFirstUser);
 
         WebViewUpdateServiceWrapper wvusWrapper = mock(WebViewUpdateServiceWrapper.class);
         when(wvusWrapper.getPackageInfosAllUsers(any(), eq(DEFAULT_PACKAGE_NAME)))
                 .thenReturn(Arrays.asList(packageForFirstUser));
 
         final String EXPECTED_DISABLED_REASON = String.format(
-                "(disabled for user %s)", sFirstUser.name);
+                "(disabled for user %s)", mFirstUser.name);
         assertThat(mPicker.getDisabledReason(wvusWrapper, mContext,
                 DEFAULT_PACKAGE_NAME)).isEqualTo(EXPECTED_DISABLED_REASON);
     }
@@ -285,14 +279,14 @@
         UserPackageWrapper packageForFirstUser = mock(UserPackageWrapper.class);
         when(packageForFirstUser.isEnabledPackage()).thenReturn(true);
         when(packageForFirstUser.isInstalledPackage()).thenReturn(false);
-        when(packageForFirstUser.getUserInfo()).thenReturn(sFirstUser);
+        when(packageForFirstUser.getUserInfo()).thenReturn(mFirstUser);
 
         WebViewUpdateServiceWrapper wvusWrapper = mock(WebViewUpdateServiceWrapper.class);
         when(wvusWrapper.getPackageInfosAllUsers(any(), eq(DEFAULT_PACKAGE_NAME)))
                 .thenReturn(Arrays.asList(packageForFirstUser));
 
         final String EXPECTED_DISABLED_REASON = String.format(
-                "(uninstalled for user %s)", sFirstUser.name);
+                "(uninstalled for user %s)", mFirstUser.name);
         assertThat(mPicker.getDisabledReason(wvusWrapper, mContext,
                 DEFAULT_PACKAGE_NAME)).isEqualTo(EXPECTED_DISABLED_REASON);
     }
@@ -302,19 +296,19 @@
         UserPackageWrapper packageForFirstUser = mock(UserPackageWrapper.class);
         when(packageForFirstUser.isEnabledPackage()).thenReturn(false);
         when(packageForFirstUser.isInstalledPackage()).thenReturn(true);
-        when(packageForFirstUser.getUserInfo()).thenReturn(sFirstUser);
+        when(packageForFirstUser.getUserInfo()).thenReturn(mFirstUser);
 
         UserPackageWrapper packageForSecondUser = mock(UserPackageWrapper.class);
         when(packageForSecondUser.isEnabledPackage()).thenReturn(true);
         when(packageForSecondUser.isInstalledPackage()).thenReturn(false);
-        when(packageForSecondUser.getUserInfo()).thenReturn(sSecondUser);
+        when(packageForSecondUser.getUserInfo()).thenReturn(mSecondUser);
 
         WebViewUpdateServiceWrapper wvusWrapper = mock(WebViewUpdateServiceWrapper.class);
         when(wvusWrapper.getPackageInfosAllUsers(any(), eq(DEFAULT_PACKAGE_NAME)))
                 .thenReturn(Arrays.asList(packageForFirstUser, packageForSecondUser));
 
         final String EXPECTED_DISABLED_REASON = String.format(
-                "(disabled for user %s)", sFirstUser.name);
+                "(disabled for user %s)", mFirstUser.name);
         assertThat(mPicker.getDisabledReason(
                 wvusWrapper, mContext, DEFAULT_PACKAGE_NAME)).isEqualTo(EXPECTED_DISABLED_REASON);
     }
@@ -328,19 +322,19 @@
         UserPackageWrapper packageForFirstUser = mock(UserPackageWrapper.class);
         when(packageForFirstUser.isEnabledPackage()).thenReturn(false);
         when(packageForFirstUser.isInstalledPackage()).thenReturn(false);
-        when(packageForFirstUser.getUserInfo()).thenReturn(sFirstUser);
+        when(packageForFirstUser.getUserInfo()).thenReturn(mFirstUser);
 
         UserPackageWrapper packageForSecondUser = mock(UserPackageWrapper.class);
         when(packageForSecondUser.isEnabledPackage()).thenReturn(true);
         when(packageForSecondUser.isInstalledPackage()).thenReturn(true);
-        when(packageForSecondUser.getUserInfo()).thenReturn(sSecondUser);
+        when(packageForSecondUser.getUserInfo()).thenReturn(mSecondUser);
 
         WebViewUpdateServiceWrapper wvusWrapper = mock(WebViewUpdateServiceWrapper.class);
         when(wvusWrapper.getPackageInfosAllUsers(any(), eq(DEFAULT_PACKAGE_NAME)))
                 .thenReturn(Arrays.asList(packageForFirstUser, packageForSecondUser));
 
         final String EXPECTED_DISABLED_REASON = String.format(
-                "(uninstalled for user %s)", sFirstUser.name);
+                "(uninstalled for user %s)", mFirstUser.name);
         assertThat(mPicker.getDisabledReason(wvusWrapper, mContext,
                 DEFAULT_PACKAGE_NAME)).isEqualTo(EXPECTED_DISABLED_REASON);
     }
@@ -354,7 +348,7 @@
         PackageItemInfo mockPackageItemInfo = mock(PackageItemInfo.class);
         mockPackageItemInfo.packageName = DEFAULT_PACKAGE_NAME;
         when(mockPackageItemInfo.loadLabel(any())).thenReturn("myPackage");
-        DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mPackageManager,
+        DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mActivity, mPackageManager,
                 mockPackageItemInfo, "" /* disabledReason */);
 
         PackageInfo packageInfo = new PackageInfo();