diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c77680d..c946122 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2742,6 +2742,19 @@
         </activity>
 
         <activity
+            android:name="Settings$PremiumSmsAccessActivity"
+            android:label="@string/premium_sms_access"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.settings.PREMIUM_SMS_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="package" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.applications.specialaccess.premiumsms.PremiumSmsAccess" />
+        </activity>
+
+        <activity
             android:name="Settings$SoundSettingsActivity"
             android:label="@string/sound_settings"
             android:icon="@drawable/ic_homepage_sound"
diff --git a/color-check-baseline.xml b/color-check-baseline.xml
index b138082..3ebe9b1 100644
--- a/color-check-baseline.xml
+++ b/color-check-baseline.xml
@@ -921,11 +921,27 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;homepage_emergency_background&quot;>#F28B82&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="95"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="    &lt;color name=&quot;homepage_system_background&quot;>#9E9E9E&lt;/color>"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="95"
+            line="96"
             column="5"/>
     </issue>
 
@@ -941,7 +957,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="96"
+            line="97"
             column="5"/>
     </issue>
 
@@ -957,7 +973,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="97"
+            line="98"
             column="5"/>
     </issue>
 
@@ -973,7 +989,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="98"
+            line="99"
             column="5"/>
     </issue>
 
@@ -989,7 +1005,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="99"
+            line="100"
             column="5"/>
     </issue>
 
@@ -1005,7 +1021,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="100"
+            line="101"
             column="5"/>
     </issue>
 
@@ -1021,7 +1037,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="102"
+            line="103"
             column="5"/>
     </issue>
 
@@ -1037,7 +1053,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="108"
+            line="109"
             column="5"/>
     </issue>
 
@@ -1053,7 +1069,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="111"
+            line="112"
             column="5"/>
     </issue>
 
@@ -1069,7 +1085,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="112"
+            line="113"
             column="5"/>
     </issue>
 
@@ -1085,7 +1101,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="113"
+            line="114"
             column="5"/>
     </issue>
 
@@ -1101,7 +1117,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="114"
+            line="115"
             column="5"/>
     </issue>
 
@@ -1117,7 +1133,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="115"
+            line="116"
             column="5"/>
     </issue>
 
@@ -1133,7 +1149,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="116"
+            line="117"
             column="5"/>
     </issue>
 
@@ -1149,7 +1165,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="119"
+            line="120"
             column="5"/>
     </issue>
 
@@ -1165,7 +1181,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="120"
+            line="121"
             column="5"/>
     </issue>
 
@@ -1181,7 +1197,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="121"
+            line="122"
             column="5"/>
     </issue>
 
@@ -1197,7 +1213,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="122"
+            line="123"
             column="5"/>
     </issue>
 
@@ -1213,7 +1229,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="123"
+            line="124"
             column="5"/>
     </issue>
 
@@ -1229,7 +1245,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="126"
+            line="127"
             column="5"/>
     </issue>
 
@@ -1245,7 +1261,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="127"
+            line="128"
             column="5"/>
     </issue>
 
@@ -1261,7 +1277,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="128"
+            line="129"
             column="5"/>
     </issue>
 
@@ -1277,7 +1293,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="129"
+            line="130"
             column="5"/>
     </issue>
 
@@ -1293,7 +1309,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="130"
+            line="131"
             column="5"/>
     </issue>
 
@@ -1309,7 +1325,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="131"
+            line="132"
             column="5"/>
     </issue>
 
@@ -1325,7 +1341,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="138"
+            line="139"
             column="5"/>
     </issue>
 
@@ -1341,7 +1357,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="139"
+            line="140"
             column="5"/>
     </issue>
 
@@ -1357,7 +1373,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="140"
+            line="141"
             column="5"/>
     </issue>
 
@@ -1373,7 +1389,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="149"
+            line="150"
             column="5"/>
     </issue>
 
@@ -1389,7 +1405,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="151"
+            line="152"
             column="5"/>
     </issue>
 
@@ -1405,7 +1421,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="155"
+            line="156"
             column="5"/>
     </issue>
 
@@ -1421,7 +1437,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="156"
+            line="157"
             column="5"/>
     </issue>
 
@@ -1437,7 +1453,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="157"
+            line="158"
             column="5"/>
     </issue>
 
@@ -1453,7 +1469,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="158"
+            line="159"
             column="5"/>
     </issue>
 
@@ -1469,7 +1485,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="159"
+            line="160"
             column="5"/>
     </issue>
 
@@ -1485,7 +1501,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="160"
+            line="161"
             column="5"/>
     </issue>
 
@@ -1501,7 +1517,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="161"
+            line="162"
             column="5"/>
     </issue>
 
@@ -1517,7 +1533,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="162"
+            line="163"
             column="5"/>
     </issue>
 
@@ -1533,7 +1549,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="165"
+            line="166"
             column="5"/>
     </issue>
 
@@ -1549,7 +1565,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="166"
+            line="167"
             column="5"/>
     </issue>
 
@@ -1565,7 +1581,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="167"
+            line="168"
             column="5"/>
     </issue>
 
@@ -1581,7 +1597,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="168"
+            line="169"
             column="5"/>
     </issue>
 
@@ -1597,7 +1613,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="169"
+            line="170"
             column="5"/>
     </issue>
 
@@ -1613,7 +1629,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="170"
+            line="171"
             column="5"/>
     </issue>
 
@@ -1629,7 +1645,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="171"
+            line="172"
             column="5"/>
     </issue>
 
@@ -1645,7 +1661,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="172"
+            line="173"
             column="5"/>
     </issue>
 
@@ -1661,7 +1677,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="175"
+            line="176"
             column="5"/>
     </issue>
 
@@ -1677,7 +1693,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="176"
+            line="177"
             column="5"/>
     </issue>
 
@@ -1693,7 +1709,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="177"
+            line="178"
             column="5"/>
     </issue>
 
@@ -1709,7 +1725,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="178"
+            line="179"
             column="5"/>
     </issue>
 
@@ -1725,7 +1741,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="179"
+            line="180"
             column="5"/>
     </issue>
 
@@ -1741,7 +1757,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="180"
+            line="181"
             column="5"/>
     </issue>
 
@@ -1757,7 +1773,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="183"
+            line="184"
             column="5"/>
     </issue>
 
@@ -1773,7 +1789,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="184"
+            line="185"
             column="5"/>
     </issue>
 
@@ -1789,7 +1805,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="185"
+            line="186"
             column="5"/>
     </issue>
 
@@ -1805,7 +1821,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="186"
+            line="187"
             column="5"/>
     </issue>
 
@@ -1821,7 +1837,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="187"
+            line="188"
             column="5"/>
     </issue>
 
@@ -1837,7 +1853,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="188"
+            line="189"
             column="5"/>
     </issue>
 
@@ -2361,6 +2377,22 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="            android:color=&quot;@color/homepage_emergency_background&quot; />"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/drawable/ic_homepage_emergency.xml"
+            line="24"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="            android:color=&quot;@color/homepage_location_background&quot; />"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -3069,7 +3101,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rAU/strings.xml"
-            line="2793"
+            line="2818"
             column="64"/>
     </issue>
 
@@ -3085,7 +3117,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rCA/strings.xml"
-            line="2793"
+            line="2818"
             column="64"/>
     </issue>
 
@@ -3101,7 +3133,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rGB/strings.xml"
-            line="2793"
+            line="2818"
             column="64"/>
     </issue>
 
@@ -3117,7 +3149,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rIN/strings.xml"
-            line="2793"
+            line="2818"
             column="64"/>
     </issue>
 
@@ -3133,7 +3165,7 @@
         errorLine2="                                                                                                                                                                         ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rXC/strings.xml"
-            line="2793"
+            line="2818"
             column="170"/>
     </issue>
 
@@ -3149,7 +3181,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/strings.xml"
-            line="6463"
+            line="6537"
             column="36"/>
     </issue>
 
@@ -3277,7 +3309,7 @@
         errorLine2="                                            ^">
         <location
             file="res/values/themes.xml"
-            line="176"
+            line="191"
             column="45"/>
     </issue>
 
@@ -3293,7 +3325,7 @@
         errorLine2="                                                ^">
         <location
             file="res/values/themes.xml"
-            line="177"
+            line="192"
             column="49"/>
     </issue>
 
@@ -3309,7 +3341,7 @@
         errorLine2="                                            ^">
         <location
             file="res/values/themes.xml"
-            line="185"
+            line="200"
             column="45"/>
     </issue>
 
@@ -3325,7 +3357,7 @@
         errorLine2="                                                ^">
         <location
             file="res/values/themes.xml"
-            line="186"
+            line="201"
             column="49"/>
     </issue>
 
@@ -3341,7 +3373,7 @@
         errorLine2="                                         ^">
         <location
             file="res/values/themes.xml"
-            line="258"
+            line="273"
             column="42"/>
     </issue>
 
diff --git a/res/drawable/ic_homepage_emergency.xml b/res/drawable/ic_homepage_emergency.xml
new file mode 100644
index 0000000..081a3fc
--- /dev/null
+++ b/res/drawable/ic_homepage_emergency.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2021 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.
+  -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item>
+        <com.android.settingslib.widget.AdaptiveIconShapeDrawable
+            android:width="@dimen/dashboard_tile_image_size"
+            android:height="@dimen/dashboard_tile_image_size"
+            android:color="@color/homepage_emergency_background" />
+    </item>
+
+    <item
+        android:width="@dimen/dashboard_tile_foreground_image_size"
+        android:height="@dimen/dashboard_tile_foreground_image_size"
+        android:start="@dimen/dashboard_tile_foreground_image_inset"
+        android:top="@dimen/dashboard_tile_foreground_image_inset"
+        android:drawable="@drawable/ic_settings_emergency" />
+</layer-list>
diff --git a/res/drawable/ic_settings_emergency.xml b/res/drawable/ic_settings_emergency.xml
new file mode 100644
index 0000000..f145346
--- /dev/null
+++ b/res/drawable/ic_settings_emergency.xml
@@ -0,0 +1,24 @@
+<!--
+    Copyright (C) 2021 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24.0dp"
+        android:height="24.0dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M9.3207,2V7.359L4.6795,4.6795L2,9.3207L6.6412,12L2,14.6795L4.6795,19.3205L9.3207,16.641V22H14.6797V16.641L19.3207,19.3205L22.0002,14.6795L17.359,12L22.0002,9.3207L19.3207,4.6795L14.6797,7.3588V2H9.3207Z"
+        android:fillColor="?android:attr/colorPrimary"/>
+</vector>
diff --git a/res/layout/fingerprint_enroll_introduction.xml b/res/layout/fingerprint_enroll_introduction.xml
index 41be2f6..0aa18fb 100644
--- a/res/layout/fingerprint_enroll_introduction.xml
+++ b/res/layout/fingerprint_enroll_introduction.xml
@@ -57,6 +57,25 @@
 
         </com.google.android.setupdesign.view.FillContentLayout>
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="@null"
+                android:src="@drawable/ic_info_outline_24dp"/>
+
+            <com.google.android.setupdesign.view.RichTextView
+                android:id="@+id/sud_layout_info"
+                style="@style/SudDescription.Glif"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/security_settings_fingerprint_enroll_introduction_bottom_message" />
+        </LinearLayout>
+
     </LinearLayout>
 
 </com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/settings_base_layout.xml b/res/layout/settings_base_layout.xml
index 9fbc2a2..0e4a76d 100644
--- a/res/layout/settings_base_layout.xml
+++ b/res/layout/settings_base_layout.xml
@@ -20,6 +20,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
+    android:transitionGroup="true"
     android:orientation="vertical">
     <Toolbar
         android:id="@+id/action_bar"
diff --git a/res/layout/settings_homepage_container.xml b/res/layout/settings_homepage_container.xml
index f210c54..fe119c6 100644
--- a/res/layout/settings_homepage_container.xml
+++ b/res/layout/settings_homepage_container.xml
@@ -57,6 +57,41 @@
         android:layout_height="wrap_content"
         android:touchscreenBlocksFocus="false"
         android:keyboardNavigationCluster="false">
-        <include layout="@layout/search_bar"/>
+        <LinearLayout
+            android:id="@+id/app_bar_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_scrollFlags="scroll|enterAlways|enterAlwaysCollapsed">
+
+            <LinearLayout
+                android:id="@+id/contextual_suggestion_content"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/suggestion_height"
+                android:paddingHorizontal="@dimen/suggestion_padding_horizontal"
+                android:paddingBottom="@dimen/suggestion_padding_bottom"
+                android:orientation="vertical"
+                android:gravity="bottom"
+                android:visibility="gone">
+
+                <TextView
+                    android:id="@+id/suggestion_title"
+                    android:text="@string/settings_label"
+                    style="@style/ContextualSuggestionText"/>
+
+                <Button
+                    android:id="@+id/suggestion_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/suggestion_button_margin_top"
+                    android:paddingHorizontal="@dimen/suggestion_button_padding_horizontal"
+                    android:visibility="gone"
+                    style="@style/ActionPrimaryButton"/>
+
+            </LinearLayout>
+
+            <include layout="@layout/search_bar"/>
+
+        </LinearLayout>
     </com.google.android.material.appbar.AppBarLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 77afb05..baeea80 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Eindtyd"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Status"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intensiteit"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Af / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Sal nooit outomaties aanskakel nie"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Sal outomaties aanskakel om <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Sal outomaties aanskakel met sonsondergang"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Aan / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Sal nooit outomaties afskakel nie"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Sal outomaties afskakel om <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Sal outomaties afskakel met sonsopkoms"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Skakel aan van sonsondergang tot -opkoms"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Skakel aan op gepasmaakte tyd"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Status"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Af / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Sal nooit outomaties aanskakel nie"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Sal outomaties aanskakel met sonsondergang"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Sal outomaties aanskakel om <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Aan/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Sal nooit outomaties afskakel nie"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Sal outomaties afskakel met sonsopkoms"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Sal outomaties afskakel om <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Skermlesers"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Oudio en teks op skerm"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Vertoon"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Interaksiekontroles"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Afgelaaide program"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Eksperimenteel"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Vee gebruiker uit"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Vee uit"</string>
     <string name="user_guest" msgid="4545590092001460388">"Gas"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Verwyder gas"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Verwyder gas?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Vee gastedata uit"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Beëindig gastesessie"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Beëindig gastesessie?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Alle programme en data in hierdie sessie sal uitgevee word."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Verwyder"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Beëindig sessie"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Skakel foonoproepe aan"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Skakel foonoproepe en SMS aan"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Vee gebruiker uit"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Nie-prioriteitgesprekke"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Gesprekke waaraan jy veranderinge gemaak het"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Onlangse gesprekke"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Vee onlangse uit"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Vee onlangse uit"</string>
     <string name="clear" msgid="5092178335409471100">"Vee uit"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Laat prioriteitgesprekke in \'n borrel verskyn"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Prioriteitgesprekke word boaan die kennisgewingskerm gewys. Jy kan ook stel dat dit in borrels verskyn en Moenie Steur Nie onderbreek."</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Gekoppel aan veelvuldige toestelle"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Stelsel-UI-demonstrasiemodus"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Donkertema"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Aan / Tydelik gedeaktiveer vanweë Batterybespaarder"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Tydelik aangeskakel vanweë Batterybespaarder"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Gesteunde programme sal ook na donker tema toe oorskakel"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Het dit"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Voorkeure"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Koppel aan publieke netwerke"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"netwerkverbinding, internet, draadloos, data, wifi, wi-fi, wi fi, sellulêr, mobiel, selfoondiensverskaffer, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Bekyk netwerke veilig vir vliegtuie"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Skakel vliegtuigmodus af"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Bekyk vliegtuigmodusnetwerke"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Skakel vliegtuigmodus af"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Gekoppel"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet sal nie outomaties koppel nie"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Geen ander netwerke beskikbaar nie"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Geen netwerke beskikbaar nie"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Nie beskikbaar nie omdat slaaptydmodus aan is"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Terugstelling van kennisgewingbelangrikheid is voltooi."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Programme"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Onvertroude toestel wil toegang tot jou boodskappe hê. Tik vir besonderhede."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Gee toegang tot boodskappe?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"\'n Onvertroude Bluetooth-toestel, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], wil toegang tot jou boodskappe hê.\n\nJy het nog nooit aan [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] gekoppel nie."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"\'n Bluetooth-toestel wat nie vertrou word nie, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, wil toegang tot jou boodskappe hê.\n\nJy het nog nooit aan <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> gekoppel nie."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Onvertroude toestel wil toegang tot jou kontakte en oproeprekord hê. Tik vir besonderhede."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Gee toegang tot kontakte en oproeprekord?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"\'n Onvertroude Bluetooth-toestel, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], wil toegang tot jou kontakte en oproeprekord hê. Dit sluit in data oor inkomende en uitgaande oproepe.\n\nJy het nog nooit aan [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] gekoppel nie."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"\'n Bluetooth-toestel wat nie vertrou word nie, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, wil toegang tot jou kontakte en oproeprekord hê. Dit sluit data oor inkomende en uitgaande oproepe in.\n\nJy het nog nooit aan <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> gekoppel nie."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Helderheid"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Sluit skerm"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Sigbaarheid"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Kleur"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Ander"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index b6a1d67..380f645 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"የመጨረሻ ሰዓት"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"ሁኔታ"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"ክብደት"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"ጠፍቷል / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"በጭራሽ በራስ-ሰር አይበራም"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"<xliff:g id="ID_1">%1$s</xliff:g> ላይ በራስ-ሰር ይበራል"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"ፀሐይ ስትጠልቅ በራስ-ሰር ይበራል"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"በርቷል / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"በጭራሽ በራስ-ሰር አይጠፋም"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"<xliff:g id="ID_1">%1$s</xliff:g> ላይ በራስ-ሰር ይጠፋል"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"ፀሐይ ስትወጣ በራስ-ሰር ይጠፋል"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"ከፀሐይ መውጣት ጀምሮ እስከ ፀሐይ ግባት ድረስ ይበራል"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"በብጁ ጊዜ ላይ ይበራል"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"ሁኔታ"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"ጠፍቷል / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"በጭራሽ በራስ-ሰር አይበራም"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"ፀሐይ ስትጠልቅ በራስ-ሰር ይበራል"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"<xliff:g id="ID_1">%1$s</xliff:g> ላይ በራስ-ሰር ይበራል"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"በርቷል / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"በጭራሽ በራስ-ሰር አይጠፋም"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"ፀሐይ ስትወጣ በራስ-ሰር ይጠፋል"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"<xliff:g id="ID_1">%1$s</xliff:g> ላይ በራስ-ሰር ይጠፋል"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"የማያ ገጽ አንባቢዎች"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ኦዲዮ እና የማያ ገጽ ላይ ጽሑፍ"</string>
     <string name="display_category_title" msgid="6638191682294461408">"አሳይ"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"የመስተጋብር መቆጣጠሪያዎች"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"እንዲወረዱ የተደረጉ መተግበሪያዎች"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"የሙከራ"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"ተጠቃሚን ሰርዝ"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"ሰርዝ"</string>
     <string name="user_guest" msgid="4545590092001460388">"እንግዳ"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"እንግዳ አስወግድ"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"እንግዳ ይወገድ?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"የእንግዳ ውሂብን አጽዳ"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"የእንግዳ ክፍለ-ጊዜ ጨርስ"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"የእንግዳ ክፍለ-ጊዜ ይብቃ?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"በዚህ ክፍለ-ጊዜ ውስጥ ያሉ ሁሉም መተግበሪያዎች እና ውሂብ ይሰረዛሉ።"</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"አስወግድ"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"ክፍለ-ጊዜን አብቃ"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"የስልክ ጥሪዎችን አብራ"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"ስልክ ጥሪዎችን እና ኤስኤምኤስን አብራ"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"ተጠቃሚን ሰርዝ"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"ቅድሚያ የማይሰጣቸው ውይይቶች"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"ለውጦች ያደረጉባቸው ውይይቶች"</string>
     <string name="recent_conversations" msgid="471678228756995274">"የቅርብ ጊዜ ውይይቶች"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"የቅርብ ጊዜዎቹን አጽዳ"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"የቅርብ ጊዜዎቹን ሁሉ አጽዳ"</string>
     <string name="clear" msgid="5092178335409471100">"አጽዳ"</string>
     <string name="important_bubble" msgid="7911698275408390846">"አረፋ ቅድሚያ ተሰጪ ውይይቶች"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"ቅድሚያ ተሰጪ ውይይቶች በተሳቢ መጋረጃው አናት ላይ ይታያሉ። እንዲሁም ወደ አረፋ እና አትረብሽን እንዲያቋርጡ ማቀናበር ይችላሉ።"</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"ከበርካታ መሣሪያዎች ጋር ተገናኝቷል"</string>
     <string name="demo_mode" msgid="6566167465451386728">"የስርዓት ተጠቃሚ በይነገጽ ማሳያ ሁነታ"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"ጨለማ ገጽታ"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"አብራ / በባትሪ ቆጣቢ ምክንያት ለጊዜው ተሰናክሏል"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"በባትሪ ቆጣቢ ምክንያት ለጊዜው በርቷል"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"የሚደገፉ መተግበሪያዎች በተጨማሪ ወደ ጨለም ያለ ገጽታ ይቀየራሉ"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"ገባኝ"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ምርጫዎች"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ከይፋዊ አውታረ መረቦች ጋር አገናኝ"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"የአውታረ መረብ ግንኙነት በይነመረብ፣ ገመድ-አልባ፣ ውሂብ፣ wifi፣ wi-fi፣ wi fi፣ ተንቀሳቃሽ ስልክ፣ ሞባይል፣ የተንቀሳቃሽ ስልክ አገልግሎት አቅራቢ፣ 4ጂ፣ 3ጂ፣ 2ጂ፣ lte፣ ኤልቲኢ"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"ለአውሮፕላን አደጋ የሌላቸው አውታረ መረቦችን ይመልከቱ"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"የአውሮፕላን ሁነታን አጥፋ"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"የአውሮፕላን ሁነታ አውታረመረቦችን ይመልከቱ"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"የአውሮፕላን ሁነታን ያጥፉ"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"ተገናኝቷል"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"በይነመረብ በራስ-ሰር አይገናኝም"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"ሌላ አውታረ መረብ የሉም"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"ምንም አውታረ መረቦች የሉም"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"የመኝታ ሰዓት ሁነታ ስለበራ የማይገኝ"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"የማሳወቂያ አስፈላጊነት ዳግም አስጀምር ተጠናቅቋል።"</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"መተግበሪያዎች"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"እምነት የማይጣልበት መሣሪያ መልዕክቶችዎን መድረስ ይፈልጋል። ዝርዝሮችን ለማግኘት መታ ያድርጉ"</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"የመልዕክቶች መዳረሻ ይፈቀድ?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"እምነት የማይጣልበት የብሉቱዝ መሣሪ፣ [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]፣ መልዕክቶችዎን መድረስ ይፈልጋል።\n\nከዚህ በፊት ከ[<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ጋር አልተገናኙም።"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"አንድ ያልታመነ የብሉቱዝ መሣሪያ <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> የእርስዎን መልዕክቶች መድረስ ይፈልጋል።\n\nከዚህ በፊት ከ<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> ጋር አልተገናኙም።"</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"እምነት የማይጣልበት መሣሪያ እውቂያዎችዎን እና የጥሪ ምዝግብ ማስታወሻውን መድረስ ይፈልጋል። ዝርዝሮችን ለማግኘት መታ ያድርጉ"</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"የእውቂያዎች እና የጥሪ ምዝግብ ማስታወሻ መዳረሻ ይፈቀድ?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"እምነት የማይጣልበት የብሉቱዝ መሣሪያ፣ [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]፣ እውቂያዎችዎን እና የጥሪ ምዝግብ ማስታወሻን መድረስ ይፈልጋል። ይህ ስለ ገቢ እና ወጪ ጥሪዎች ውሂብን ያካትታል።\n\n ከዚህ በፊት ከ[<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ጋር አልተገናኙም።"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"አንድ ያልታመነ የብሉቱዝ መሣሪያ <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> የእርስዎን እውቂያዎች እና የጥሪ ምዝግብ ማስታወሻ መድረስ ይፈልጋል። ይህ የገቢ እና ወጪ ጥሪዎች ውሂብን ያካትታል።\n\n ከዚህ በፊት ከ<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> ጋር አልተገናኙም።"</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"ብሩህነት"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"የቆልፍ ማሳያ"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"ታይነት"</string>
+    <string name="category_name_color" msgid="937514550918977151">"ቀለም"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"ሌሎች"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 4b41b76..c37029b 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -1309,11 +1309,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"وقت الانتهاء"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"الحالة"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"الكثافة"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"غير مفعّلة / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"لن يتم تفعيل الميزة تلقائيًا على الإطلاق."</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"سيتم التفعيل تلقائيًا في <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"سيتم التفعيل تلقائيًا عند غروب الشمس"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"تم التشغيل / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"لن يتم الإيقاف تلقائيًا مطلقًا"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"سيتم الإيقاف تلقائيًا عند الساعة <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"سيتم الإيقاف تلقائيًا عند شروق الشمس"</string>
@@ -1336,11 +1334,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"التفعيل من غروب الشمس حتى شروقها"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"تفعيل الإعداد في وقت مخصّص"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"الحالة"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"غير مفعَّل / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"لن يتم مطلقًا تفعيل الوضع تلقائيًا."</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"سيتم تفعيل الوضع تلقائيًا عند غروب الشمس"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"سيتم تفعيل الإعداد تلقائيًا في <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"مفعَّل / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"لن يتم مطلقًا إيقاف الوضع تلقائيًا."</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"سيتم إيقاف الوضع تلقائيًا عند شروق الشمس"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"سيتم إيقاف الإعداد تلقائيًا في <xliff:g id="ID_1">%1$s</xliff:g>."</string>
@@ -2232,6 +2228,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"أجهزة قارئ الشاشة"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"الصوت والنص على الشاشة"</string>
     <string name="display_category_title" msgid="6638191682294461408">"العرض"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"عناصر التحكم في التفاعل"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"التطبيقات التي تم تنزيلها"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"إعدادات تجريبية"</string>
@@ -3247,10 +3245,15 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"حذف مستخدم"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"حذف"</string>
     <string name="user_guest" msgid="4545590092001460388">"ضيف"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"إزالة جلسة الضيف"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"هل تريد إزالة جلسة الضيف؟"</string>
+    <!-- no translation found for user_clear_guest_menu (4864362688187480452) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_menu (5064400453222497734) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_confirm_title (7526978959527761497) -->
+    <skip />
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"سيتم حذف كل التطبيقات والبيانات في هذه الجلسة."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"إزالة"</string>
+    <!-- no translation found for user_exit_guest_dialog_remove (8095094235815676847) -->
+    <skip />
     <string name="user_enable_calling" msgid="264875360626905535">"تفعيل المكالمات الهاتفية"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"تفعيل المكالمات الهاتفية والرسائل القصيرة"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"حذف حساب المستخدم"</string>
@@ -3771,7 +3774,8 @@
     <string name="other_conversations" msgid="551178916855139870">"المحادثات غير ذات الأولوية"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"المحادثات التي أجريت تغييرات عليها"</string>
     <string name="recent_conversations" msgid="471678228756995274">"المحادثات الأخيرة"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"محو المحادثات الحديثة"</string>
+    <!-- no translation found for conversation_settings_clear_recents (4246342656145488662) -->
+    <skip />
     <string name="clear" msgid="5092178335409471100">"محو"</string>
     <string name="important_bubble" msgid="7911698275408390846">"تظهر المحادثات ذات الأولوية كفقاعات"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"تظهر المحادثات ذات الأولوية في أعلى مركز الإشعارات المنسدل. يمكنك أيضًا ضبطها لتظهر كفقاعات ولا تتقيّد بميزة \"عدم الإزعاج\"."</string>
@@ -4704,7 +4708,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"متصل بأجهزة متعددة"</string>
     <string name="demo_mode" msgid="6566167465451386728">"وضع تجريبي لواجهة مستخدم النظام"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"المظهر الداكن"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"مفعّل / تم إيقاف التبديل مؤقتًا بسبب تفعيل وضع \"توفير شحن البطارية\"."</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"مفعّل مؤقتًا نتيجة تفعيل وضع \"توفير شحن البطارية\""</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"سيتم تبديل التطبيقات المتوافقة أيضًا إلى المظهر الداكن"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"حسنًا"</string>
@@ -5395,15 +5400,34 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"التفضيلات"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"‏الاتصال بشبكات Wi-Fi عامة"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"‏الاتصال بالشبكة، الإنترنت، لاسلكي، بيانات، wifi، wi-fi، wi fi، خلوي، جهاز جوّال، مشغل شبكة الجوال، جيل رابع، جيل ثالث، جيل ثاني، lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"عرض الشبكات الآمنة في وضع الطيران"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"إيقاف \"وضع الطيران\""</string>
+    <!-- no translation found for view_airplane_safe_networks (9170023210981508906) -->
+    <skip />
+    <!-- no translation found for turn_off_airplane_mode (7141986366534514443) -->
+    <skip />
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"متصلة بالإنترنت"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"لن يتم الاتصال بالإنترنت تلقائيًا."</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"لا تتوفّر شبكات أخرى."</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"لا تتوفّر أي شبكات."</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"الميزة غير متاحة لأن وضع \"وقت النوم\" مفعّل."</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"اكتملت عملية إعادة ضبط درجة الأهمية الخاصة بالإشعارات."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"التطبيقات"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"يريد جهاز غير موثوق الوصول إلى رسائلك. انقر للحصول على التفاصيل."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"هل تريد السماح بالوصول إلى الرسائل؟"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"يريد جهاز غير موثوق يتضمّن بلوتوث، [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]، الوصول إلى رسائلك.\n\nلم يتم ربطك بالجهاز [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] في السابق."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"يريد جهاز غير موثوق يتضمّن بلوتوث، <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>، الوصول إلى رسائلك.\n\nلم يتم ربطك بالجهاز <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> في السابق."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"يريد جهاز غير موثوق الوصول إلى جهات الاتصال وسجلّ المكالمات. انقر للحصول على التفاصيل."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"هل تريد السماح بالوصول إلى جهات الاتصال وسجلّ المكالمات؟"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"يريد جهاز غير موثوق يتضمّن بلوتوث، [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]، الوصول إلى جهات الاتصال وسجلّ المكالمات. يتضمن ذلك الوصول إلى بيانات عن المكالمات الواردة والصادرة.\n\nلم يتم ربطك بالجهاز [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] في السابق."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"يريد جهاز غير موثوق يتضمّن بلوتوث، <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>، الوصول إلى جهات الاتصال وسجلّ المكالمات. يتضمن ذلك الوصول إلى بيانات عن المكالمات الواردة والصادرة.\n\nلم يتم ربطك بالجهاز <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> في السابق."</string>
+    <!-- no translation found for category_name_brightness (8520372392029305084) -->
+    <skip />
+    <!-- no translation found for category_name_lock_display (7478785189102882266) -->
+    <skip />
+    <!-- no translation found for category_name_visibility (4485030512199246405) -->
+    <skip />
+    <!-- no translation found for category_name_color (937514550918977151) -->
+    <skip />
+    <!-- no translation found for category_name_others (2366006298768550310) -->
+    <skip />
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 2b52ef1..c7cc93c 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"সমাপ্ত হোৱাৰ সময়"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"স্থিতি"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"তীব্ৰতা"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"অফ আছে / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"স্বয়ংক্ৰিয়ভাৱে কেতিয়াও অন নহ’ব"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"<xliff:g id="ID_1">%1$s</xliff:g>ত স্বয়ংক্ৰিয়ভাৱে অন হ’ব"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"সূৰ্যাস্তৰ সময়ত স্বয়ংক্ৰিয়ভাৱে অন হ’ব"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"অন / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"স্বয়ংক্ৰিয়ভাৱে কেতিয়াও অফ নহ’ব"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"<xliff:g id="ID_1">%1$s</xliff:g> বজাত স্বয়ংক্ৰিয়ভাৱে অফ হ’ব"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"সূৰ্যোদয়ৰ সময়ত স্বয়ংক্ৰিয়ভাৱে অফ হ’ব"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"সূৰ্যাস্তৰ পৰা সূৰ্যোদয়লৈ অন হয়"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"কাষ্টম সময়ত অন কৰে"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"স্থিতি"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"অফ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"স্বয়ংক্ৰিয়ভাৱে কেতিয়াও অন নহ’ব"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"সূৰ্যাস্তৰ সময়ত স্বয়ংক্ৰিয়ভাৱে অন হ’ব"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"<xliff:g id="ID_1">%1$s</xliff:g>ত স্বয়ংক্ৰিয়ভাৱে অন হ’ব"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"অন / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"কেতিয়াও স্বয়ংক্ৰিয়ভাৱে অফ নহ’ব"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"সূৰ্যোদয়ৰ সময়ত স্বয়ংক্ৰিয়ভাৱে অফ হ’ব"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"<xliff:g id="ID_1">%1$s</xliff:g> বজাত স্বয়ংক্ৰিয়ভাৱে অফ হ’ব"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"স্ক্ৰীণ ৰিডাৰ"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"অডিঅ\' আৰু স্ক্ৰীণত প্ৰদৰ্শিত পাঠ"</string>
     <string name="display_category_title" msgid="6638191682294461408">"ডিছপ্লে’"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"ভাব-বিনিময় নিয়ন্ত্ৰণ"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"ডাউনল’ড কৰা এপ্"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"পৰীক্ষামূলক"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"ব্যৱহাৰকাৰীক মচক"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"মচক"</string>
     <string name="user_guest" msgid="4545590092001460388">"অতিথি"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"অতিথি আঁতৰাওক"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"অতিথি আঁতৰাবনে?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"অতিথিৰ ডেটা মচক"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"অতিথিৰ ছেশ্বন সমাপ্ত কৰক"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"অতিথিৰ ছেশ্বন সমাপ্ত কৰিবনে?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"এই ছেছনৰ সকলো এপ্ আৰু ডেটা মচা হ\'ব।"</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"আঁতৰাওক"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"ছেশ্বন সমাপ্ত কৰক"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"ফ\'ন কল অন কৰক"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"ফ\'ন কল আৰু এছএমএছ অন কৰক"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"ব্যৱহাৰকাৰীজন মচক"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"অগ্ৰাধিকাৰ নথকা বাৰ্তালাপসমূহ"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"আপুনি সালসলনি কৰা বার্তালাপসমূহ"</string>
     <string name="recent_conversations" msgid="471678228756995274">"শেহতীয়া বাৰ্তালাপসমূহ"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"শেহতীয়াসমূহ মচক"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"শেহতীয়া আটাইবোৰ মচক"</string>
     <string name="clear" msgid="5092178335409471100">"মচক"</string>
     <string name="important_bubble" msgid="7911698275408390846">"অগ্ৰাধিকাৰপ্ৰাপ্ত বার্তালাপসমূহ বাবল কৰক"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"অগ্ৰাধিকাৰপ্ৰাপ্ত বার্তালাপসমূহ পুল-ডাউন শ্বেডটোৰ একেবাৰে ওপৰত দেখুওৱা হয়। আপুনি সেইবোৰ বাবললৈ ছেট কৰিব পাৰে আৰু অসুবিধা নিদিবত ব্যাঘাত জন্মাব পাৰে।"</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"একাধিক ডিভাইচৰ সৈতে সংযোজিত হৈ আছে"</string>
     <string name="demo_mode" msgid="6566167465451386728">"ছিষ্টেম ইউআই প্ৰদৰ্শন ম\'ড"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"গাঢ় ৰঙৰ থীম"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"অন আছে / বেটাৰি সঞ্চয়কাৰীৰ বাবে অস্থায়ীভাৱে অক্ষম কৰা হৈছে"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"বেটাৰি সঞ্চয়কাৰীৰ বাবে অস্থায়ীভাৱে অক্ষম কৰা হৈছে"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"সমৰ্থিত এপ্‌বোৰতো গাঢ় ৰঙৰ থীম ব্যৱহাৰ কৰা হ’ব"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"বুজি পালোঁ"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"অগ্ৰাধিকাৰ"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ৰাজহুৱা নেটৱৰ্কসমূহৰ সৈতে সংযোগ কৰক"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"নেটৱৰ্ক সংযোগ, ইণ্টাৰনেট, বেতাঁৰ, ডেটা, ৱাইফাই, ৱাই-ফাই, ৱাই ফাই, চেলুলাৰ, ম’বাইল, চেল কেৰিয়াৰ, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"এয়াৰপ্লেন-সুৰক্ষিত নেটৱৰ্ক চাওক"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"এয়াৰপ্লেন ম’ডটো অফ কৰক"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"এয়াৰপ্লেন ম’ডৰ নেটৱৰ্ক চাওক"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"এয়াৰপ্লে’ন ম’ডটো অফ কৰক"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"সংযোজিত হৈ আছে"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"ইণ্টাৰনেট স্বয়ংক্ৰিয়ভাৱে সংযুক্ত নহ’ব"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"অন্য কোনো নেটৱৰ্ক উপলব্ধ নহয়"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"কোনো নেটৱৰ্ক উপলব্ধ নহয়"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"শোৱাৰ সময়ৰ ম’ড অন হৈ থকাৰ বাবে উপলব্ধ নহয়"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"জাননীৰ গুৰুত্ব ৰিছেট কৰাটো সম্পূৰ্ণ হৈছে।"</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"এপ্‌"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"অবিশ্বস্ত ডিভাইচে আপোনাৰ বাৰ্তাসমূহ এক্সেছ কৰিব বিচাৰিছে। সবিশেষ জানিবলৈ টিপক।"</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"বাৰ্তাৰ এক্সেছ দিবনে?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"এটা অবিশ্বস্ত ব্লুটুথ ডিভাইচ, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]এ, আপোনাৰ বাৰ্তাসমূহ এক্সেছ কৰিব বিচাৰিছে।\n\nআপুনি আগতে [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]ৰ সৈতে সংযোগ কৰা নাই।"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"এটা অবিশ্বস্ত ব্লুটুথ ডিভাইচ, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]এ, আপোনাৰ বাৰ্তা এক্সেছ কৰিব বিচাৰিছে।\n\nআপুনি আগতে [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]ৰ সৈতে সংযোগ কৰা নাই।"</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"অবিশ্বস্ত ডিভাইচে আপোনাৰ সম্পৰ্কসূচী আৰু কল লগ এক্সেছ কৰিব বিচাৰিছে। সবিশেষ জানিবলৈ টিপক।"</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"সম্পৰ্কসূচী আৰু কল লগ এক্সেছ কৰিবলৈ দিবনে?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"এটা অবিশ্বস্ত ব্লুটুথ ডিভাইচ, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]এ, আপোনাৰ সম্পৰ্কসূচী আৰু কল লগ এক্সেছ কৰিব বিচাৰিছে। ইয়াত অন্তৰ্গামী আৰু বহিৰ্গামী কল সম্পৰ্কীয় ডেটা অন্তৰ্ভুক্ত।\n\nআপুনি আগতে [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]ৰ সৈতে সংযোগ কৰা নাই।"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"এটা অবিশ্বস্ত ব্লুটুথ ডিভাইচ, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]এ, আপোনাৰ সম্পৰ্কসূচী আৰু কল লগ এক্সেছ কৰিব বিচাৰিছে। ইয়াত অন্তৰ্গামী আৰু বহিৰ্গামী কল সম্পৰ্কীয় ডেটা অন্তৰ্ভুক্ত।\n\nআপুনি আগতে [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]ৰ সৈতে সংযোগ কৰা নাই।"</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"উজ্জ্বলতা"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"ডিছপ্লে’ লক কৰক"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"দৃশ্যমানতা"</string>
+    <string name="category_name_color" msgid="937514550918977151">"ৰং"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"অন্যান্য"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 3e10a02..511083c 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Bitmə tarixi"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Status"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"İntensivlik"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"DEAKTİV / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Heç vaxt avtomatik aktiv etməyəcək"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"<xliff:g id="ID_1">%1$s</xliff:g> radələrində avtomatik aktiv edəcək"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Qürub vaxtı avtomatik aktiv edəcək"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"AKTİV / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Heç vaxt avtomatik deaktiv etməyəcək"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"<xliff:g id="ID_1">%1$s</xliff:g> radələrində avtomatik deaktiv edəcək"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Şəfəq vaxtı avtomatik deaktiv edəcək"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Gün çıxandan batanadək aktiv"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Xüsusi vaxtda aktiv olur"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Status"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Deaktiv / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Heç vaxt avtomatik aktiv olmayacaq"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Gün batanda avtomatik aktiv olacaq"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Bu vaxt avtomatik aktiv olacaq: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Aktiv/ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Heç vaxt avtomatik deaktiv olmayacaq"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Gün çıxanda avtomatik deaktiv olacaq"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Bu vaxt avtomatik deaktiv olacaq: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Ekran oxuyucuları"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio və ekran mətni"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Ekran"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Qarşılıqlı əlaqə nəzarəti"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Endirilmiş tətbiqlər"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Eksperimental"</string>
@@ -3075,10 +3073,15 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Istifadəçini sil"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Sil"</string>
     <string name="user_guest" msgid="4545590092001460388">"Qonaq"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Qonağı silin"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Qonaq silinsin?"</string>
+    <!-- no translation found for user_clear_guest_menu (4864362688187480452) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_menu (5064400453222497734) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_confirm_title (7526978959527761497) -->
+    <skip />
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Bu sessiyada bütün tətbiqlər və data itəcək."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Yığışdır"</string>
+    <!-- no translation found for user_exit_guest_dialog_remove (8095094235815676847) -->
+    <skip />
     <string name="user_enable_calling" msgid="264875360626905535">"Telefon zənglərini aktivləşdir"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Telefon zəngləri &amp; SMS-i aktivləşdir"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"İstifadəçini silin"</string>
@@ -3591,7 +3594,8 @@
     <string name="other_conversations" msgid="551178916855139870">"Prioritet olmayan söhbətlər"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Dəyişikliklər etdiyiniz söhbətlər"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Son söhbətlər"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Sonuncuları silin"</string>
+    <!-- no translation found for conversation_settings_clear_recents (4246342656145488662) -->
+    <skip />
     <string name="clear" msgid="5092178335409471100">"Silin"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Prioritet söhbətləri qabaqcıq şəklində göstərin"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Prioritet söhbətlər bildiriş panelinin yuxarısında göstərilir. Həmçinin, onların qabaqcıq şəklində göstərilməsini və \"Narahat Etməyin\" rejimini bölməsini ayarlaya bilərsiniz."</string>
@@ -4424,7 +4428,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Bir çox cihaza qoşuldu"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Sistem İİ demo rejimi"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Tünd tema"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Aktiv/Enerjiyə Qənaət rejiminə görə müvəqqəti deaktivdir"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Enerjiyə Qənaət rejiminə görə müvəqqəti aktivdir"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Dəstəklənən tətbiqlər də tünd temaya keçəcək"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Anladım"</string>
@@ -5063,15 +5068,34 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Tərcihlər"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"İctimai şəbəkələrə qoşulun"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"şəbəkə bağlantısı, internet, simsiz, data, wifi, wi-fi, wi fi, mobil şəbəkə, mobil, mobil operator, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Təyyarə üçün güvənli şəbəkələrə baxın"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Təyyarə Rejimini deaktiv edin"</string>
+    <!-- no translation found for view_airplane_safe_networks (9170023210981508906) -->
+    <skip />
+    <!-- no translation found for turn_off_airplane_mode (7141986366534514443) -->
+    <skip />
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Qoşulub"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"İnternet avtomatik qoşulmayacaq"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Heç bir başqa şəbəkə əlçatan deyil"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Əlçatan şəbəkə yoxdur"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Yuxu vaxtı rejimi aktiv olduğuna görə əlçatan deyil"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Bildiriş əhəmiyyətinin sıfırlanması tamamlandı."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Tətbiqlər"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Güvənsiz cihaz mesajlarınıza giriş etmək istəyir. Detallar üçün toxunun."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Mesajlara girişə icazə verilsin?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Güvənsiz Bluetooth cihazı [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] mesajlarınıza giriş etmək istəyir.\n\nDaha öncə [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] cihazına qoşulmamısınız."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Güvənsiz Bluetooth cihazı <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> mesajlarınıza giriş etmək istəyir.\n\nDaha öncə <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> cihazına qoşulmamısınız."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Güvənsiz cihaz kontaktlarınıza və zəng siyahınıza giriş etmək istəyir. Detallar üçün toxunun."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Kontaktlara və zəng siyahısına girişə icazə verilsin?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Güvənsiz Bluetooth cihazı [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] kontaktlarınıza və zəng siyahınıza giriş etmək istəyir. Gələn və gedən zənglər barədə data buna daxildir.\n\nDaha öncə [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] cihazına qoşulmamısınız."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Güvənsiz Bluetooth cihazı <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> kontaktlarınıza və zəng siyahınıza giriş etmək istəyir. Gələn və gedən zənglər barədə data buna daxildir.\n\nDaha öncə <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> cihazına qoşulmamısınız."</string>
+    <!-- no translation found for category_name_brightness (8520372392029305084) -->
+    <skip />
+    <!-- no translation found for category_name_lock_display (7478785189102882266) -->
+    <skip />
+    <!-- no translation found for category_name_visibility (4485030512199246405) -->
+    <skip />
+    <!-- no translation found for category_name_color (937514550918977151) -->
+    <skip />
+    <!-- no translation found for category_name_others (2366006298768550310) -->
+    <skip />
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 11c8bce..d14415c 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -1249,11 +1249,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Vreme završetka"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Status"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intenzitet"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Isključeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Nikada se ne uključuje automatski"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Uključuje se automatski u <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Uključuje se automatski kada sunce zađe"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Uključeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Nikada se ne isključuje automatski"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Isključuje se automatski u <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Isključuje se automatski kada sunce izađe"</string>
@@ -1276,11 +1274,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Uključuje se od sumraka do svitanja"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Uključuje se u željeno vreme"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Status"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Isključeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Nikada se ne uključuje automatski"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Uključuje se automatski kada sunce zađe"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Uključuje se automatski u <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Uključeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Nikada se ne isključuje automatski"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Isključuje se automatski kada sunce izađe"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Isključuje se automatski u <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2160,6 +2156,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Čitači ekrana"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Zvuk i tekst na ekranu"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Prikaz"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Kontrole interakcije"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Preuzete aplikacije"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Eksperimentalno"</string>
@@ -2487,7 +2485,7 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Tablet ste koristili duže nego obično"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Uređaj ste koristili duže nego obično"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Baterija može da se isprazni ranije nego obično"</string>
-    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optimizuje se radi dobrog stanja baterije"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optimizuje se radi boljeg stanja baterije"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Baterija je trenutno ograničena. Dodirnite da biste saznali više."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Uređaj ste koristili duže nego obično. Baterija može da se isprazni ranije od očekivanog.\n\nAplikacije sa najvećom potrošnjom baterije:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Tablet ste koristili duže nego obično. Baterija može da se isprazni ranije od očekivanog.\n\nAplikacije sa najvećom potrošnjom baterije:"</string>
@@ -3118,10 +3116,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Brisanje korisnika"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Izbriši"</string>
     <string name="user_guest" msgid="4545590092001460388">"Gost"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Ukloni gosta"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Želite li da uklonite gosta?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Obriši podatke gosta"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Završi sesiju gosta"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Želite da završite sesiju gosta?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Sve aplikacije i podaci u ovoj sesiji će biti izbrisani."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Ukloni"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Završi sesiju"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Uključi telefonske pozive"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Uključi telefonske pozive i SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Izbrišite korisnika"</string>
@@ -3636,7 +3635,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Konverzacije koje nisu prioritetne"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Konverzacije koje ste menjali"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Nedavne konverzacije"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Obriši nedavno"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Obriši sve nedavno"</string>
     <string name="clear" msgid="5092178335409471100">"Obriši"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Prikaži prioritetne konverzacije u oblačićima"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Prioritetne konverzacije se prikazuju u vrhu kliznog panela. Možete i da ih podesite tako da imaju oblačiće i da prekidaju režim Ne uznemiravaj."</string>
@@ -4494,7 +4493,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Povezan je sa više uređaja"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Režim demonstracije za korisnički interfejs sistema"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Tamna tema"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Uključeno/Privremeno onemogućeno zbog Uštede baterije"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Privremeno uključeno zbog Uštede baterije"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Podržane aplikacije će takođe preći na tamnu temu"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Važi"</string>
@@ -5146,15 +5146,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Podešavanja"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Povežite se sa javnim mrežama"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"mrežna veza, internet, bežično, podaci, wifi, wi-fi, wi fi, mobilni telefon, mobilni, mobilni operater, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Prikaži mreže bezbedne za avion"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Isključi režim rada u avionu"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Prikaži mreže za režim rada u avionu"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Isključite režim rada u avionu"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Povezano"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Automatsko povezivanje na internet nije moguće"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Nije dostupna nijedna druga mreža"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Nema dostupnih mreža"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Nedostupno je jer je noćni režim uključen"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Resetovanje važnosti obaveštenja je dovršeno."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Aplikacije"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Nepouzdani uređaj želi da pristupa porukama. Dodirnite za detalje."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Želite li da dozvolite pristup porukama?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Nepouzdani Bluetooth uređaj, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], želi da pristupa porukama.\n\nRanije se niste povezivali sa uređajem [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Nepouzdani Bluetooth uređaj, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, želi da pristupa porukama.\n\nRanije se niste povezivali sa uređajem <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Nepouzdani uređaj želi da pristupa kontaktima i evidenciji poziva. Dodirnite za detalje."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Želite li da dozvolite pristup kontaktima i evidenciji poziva?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Nepouzdani Bluetooth uređaj, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], želi da pristupa kontaktima i evidenciji poziva. To obuhvata podatke o dolaznim i odlaznim pozivima.\n\nRanije se niste povezivali sa uređajem [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Nepouzdani Bluetooth uređaj, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, želi da pristupa kontaktima i evidenciji poziva. To obuhvata podatke o dolaznim i odlaznim pozivima.\n\nRanije se niste povezivali sa uređajem <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Osvetljenost"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Zaključajte ekran"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Vidljivost"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Boja"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Drugo"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 875967b..938b6a8 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -1269,11 +1269,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Час заканчэння"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Стан"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Інтэнсіўнасць"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Выкл. / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Не ўключаецца аўтаматычна"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Уключыцца аўтаматычна ў <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Уключыцца аўтаматычна на захадзе сонца"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Укл. / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Ніколі не выключыцца аўтаматычна"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Выключыцца аўтаматычна ў <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Выключыцца аўтаматычна на ўсходзе сонца"</string>
@@ -1296,11 +1294,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Уключаецца ад захаду да ўсходу"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Уключаецца ў вызначаны час"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Стан"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Выключана / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Не ўключаецца аўтаматычна"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Уключыцца аўтаматычна на захадзе сонца"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Уключыцца аўтаматычна ў <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Уключана / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Ніколі не выключыцца аўтаматычна"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Выключыцца аўтаматычна на ўсходзе сонца"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Выключыцца аўтаматычна ў <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2184,6 +2180,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Праграмы чытання з экрана"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Аўдыя і тэкст на экране"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Дысплэй"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Элементы кіравання ўзаемадзеяннем"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Спампаваныя праграмы"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Эксперыментальныя"</string>
@@ -3161,10 +3159,15 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Выдалiць карыстальніка"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Выдаліць"</string>
     <string name="user_guest" msgid="4545590092001460388">"Госць"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Выдаліць госця"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Выдаліць госця?"</string>
+    <!-- no translation found for user_clear_guest_menu (4864362688187480452) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_menu (5064400453222497734) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_confirm_title (7526978959527761497) -->
+    <skip />
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Усе дадаткі і даныя гэтага сеансу будуць выдаленыя."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Выдаліць"</string>
+    <!-- no translation found for user_exit_guest_dialog_remove (8095094235815676847) -->
+    <skip />
     <string name="user_enable_calling" msgid="264875360626905535">"Уключыць тэлефонныя выклікі"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Уключыць тэлефонныя выклікі і SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Выдаліць карыстальніка"</string>
@@ -3681,7 +3684,8 @@
     <string name="other_conversations" msgid="551178916855139870">"Непрыярытэтныя размовы"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Размовы, у якія вы ўнеслі змяненні"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Нядаўнія размовы"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Ачысціць нядаўнія"</string>
+    <!-- no translation found for conversation_settings_clear_recents (4246342656145488662) -->
+    <skip />
     <string name="clear" msgid="5092178335409471100">"Ачысціць"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Паказваць прыярытэтныя размовы ў выглядзе ўсплывальных апавяшчэнняў"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Прыярытэтныя размовы паказваюцца ў верхняй частцы панэлі апавяшчэнняў. Вы можаце таксама наладзіць іх паказ у выглядзе ўсплывальных апавяшчэнняў і пры ўключаным рэжыме \"Не турбаваць\"."</string>
@@ -4564,7 +4568,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Падключана да некалькіх прылад"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Рэжым дэманстрацыі сістэмнага інтэрфейсу карыстальніка"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Цёмная тэма"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Укл. / Часова адключана ў рэжыме эканоміі зараду"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Часова ўключана ў рэжыме эканоміі зараду"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Праграмы, якія падтрымліваюцца, таксама пераключацца на цёмную тэму"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Зразумела"</string>
@@ -5229,15 +5234,34 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Параметры"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Падключацца да агульнадаступных сетак"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"падключэнне да сеткі, інтэрнэт, бесправадны, даныя, wifi, wi-fi, wi fi, сотавая сетка, мабільны, аператар сотавай сувязі, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Праглядзець бяспечныя ў самалёце сеткі"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Выключыць рэжым палёту"</string>
+    <!-- no translation found for view_airplane_safe_networks (9170023210981508906) -->
+    <skip />
+    <!-- no translation found for turn_off_airplane_mode (7141986366534514443) -->
+    <skip />
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Падключана"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Аўтаматычнае падключэнне да інтэрнэту адсутнічае"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Больш няма даступных сетак"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Няма даступных сетак"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Недаступна, бо ўключаны начны рэжым"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Скід налад важнасці апавяшчэнняў завершаны."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Праграмы"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Падазроная прылада запытвае доступ да вашых паведамленняў. Націсніце, каб убачыць больш інфармацыі."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Дазволіць доступ да паведамленняў?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Падазроная прылада з Bluetooth, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], запытвае доступ да вашых паведамленняў.\n\nРаней вы не падключаліся да прылады [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Падазроная прылада з Bluetooth, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, запытвае доступ да вашых паведамленняў.\n\nРаней вы не падключаліся да прылады \"<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>\"."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Падазроная прылада запытвае доступ да кантактаў і журнала выклікаў. Націсніце, каб убачыць больш інфармацыі."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Дазволіць доступ да кантактаў і журнала выклікаў?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Падазроная прылада з Bluetooth, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], запытвае доступ да кантактаў і журнала выклікаў, у тым ліку да даных пра ўваходныя і выходныя выклікі.\n\nРаней вы не падключаліся да прылады [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Падазроная прылада з Bluetooth, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, запытвае доступ да кантактаў і журнала выклікаў, у тым ліку да даных пра ўваходныя і выходныя выклікі.\n\nРаней вы не падключаліся да прылады \"<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>\"."</string>
+    <!-- no translation found for category_name_brightness (8520372392029305084) -->
+    <skip />
+    <!-- no translation found for category_name_lock_display (7478785189102882266) -->
+    <skip />
+    <!-- no translation found for category_name_visibility (4485030512199246405) -->
+    <skip />
+    <!-- no translation found for category_name_color (937514550918977151) -->
+    <skip />
+    <!-- no translation found for category_name_others (2366006298768550310) -->
+    <skip />
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 08f6d6f..2062836 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Краен час"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Състояние"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Наситеност"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Изкл./<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Няма да се включи автоматично"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Ще се включи автоматично в <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Ще се включи автоматично при залез"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Включено/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Няма да се изключи автоматично"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Ще се изключи автоматично в <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Ще се изключи автоматично при изгрев"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Включва се от залез до изгрев"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Включва се в избран час"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Състояние"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Изкл./<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Няма да се включи автоматично"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Ще се включва автоматично при залез"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Ще се включи автоматично в <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Вкл./<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Няма да се изключва автоматично"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Ще се изключва автоматично при изгрев"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Ще се изключи автоматично в <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Екранни четци"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Аудио и екранен текст"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Дисплей"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Контроли за взаимодействие"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Изтеглени приложения"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Експериментални"</string>
@@ -2456,7 +2454,7 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Таблетът е използван повече от обикновено"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Устройството е използвано повече от обикновено"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Батерията може да се изтощи по-рано от обикновено"</string>
-    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Оптимизиране за състоянието на батерията"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Оптимизиране с цел състоянието на батерията"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Батерията е временно ограничена. Докоснете, за да научите повече."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Телефонът ви е използван повече от обикновено. Батерията може да се изтощи по-рано от очакваното.\n\nПриложения с най-висок разход на батерията:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Таблетът ви е използван повече от обикновено. Батерията може да се изтощи по-рано от очакваното.\n\nПриложения с най-висок разход на батерията:"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Изтриване на потребителя"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Изтриване"</string>
     <string name="user_guest" msgid="4545590092001460388">"Гост"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Премахване на госта"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Да се премахне ли гостът?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Изчистване на данните за госта"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Прекратяване на сесията като гост"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Да се прекрати ли сесията като гост?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Всички приложения и данни в тази сесия ще бъдат изтрити."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Премахване"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Прекратяване на сесията"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Включване на телефонните обаждания"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Включване на тел. обаждания и SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Изтриване на потребителя"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Разговори без приоритет"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Разговори, в които сте направили промени"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Скорошни разговори"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Изчистване на скорошни"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Изчистване на скорошните"</string>
     <string name="clear" msgid="5092178335409471100">"Изчистване"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Показване на балонче за приоритетните разговори"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Приоритетните разговори се показват най-горе в падащия панел. Можете също да зададете да се поставят в балонче и да ви прекъсват, когато използвате режима „Не безпокойте“."</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Установена е връзка с няколко устройства"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Демонстрационен режим на системния ПИ"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Тъмна тема"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Включено/временно деактивирано с цел запазване на батерията"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Временно включено с цел запазване на батерията"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Поддържаните приложения също ще превключат към тъмна тема"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Разбрах"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Предпочитания"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Свързване с обществени мрежи"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"връзка с мрежата, интернет, безжична мрежа, данни, Wi-Fi, мобилни данни, мобилна мрежа, мобилен оператор, 4G, 3G, 2G, LTE"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Мрежи, безопасни за ползване по време на полет"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Изключете самолетния режим"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Преглед на мрежите за самолетен режим"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Изключване на самолетния режим"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Свързано"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Няма автоматично да се установи връзка с интернет"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Няма други налични мрежи"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Няма налични мрежи"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Не е налице, тъй като режимът „Време за сън“ е включен"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Нулирането на настройките за важност на известията завърши."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Приложения"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Ненадеждно устройство иска достъп до съобщенията ви. Докоснете за подробности."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Да се разреши ли достъпът до съобщенията?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Ненадеждно устройство с Bluetooth (<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>) иска достъп до съобщенията ви.\n\nДосега не сте се свързвали с(ъс) <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Ненадеждно устройство с Bluetooth (<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>) иска достъп до съобщенията ви.\n\nДосега не сте се свързвали с(ъс) <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Ненадеждно устройство иска достъп до контактите и списъка с обажданията ви. Докоснете за подробности."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Да се разреши ли достъпът до контактите и списъка с обажданията?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Ненадеждно устройство с Bluetooth (<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>) иска достъп до контактите и списъка с обажданията ви. Това включва данни за входящите и изходящите обаждания.\n\nДосега не сте се свързвали с(ъс) <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Ненадеждно устройство с Bluetooth (<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>) иска достъп до контактите и списъка с обажданията ви. Това включва данни за входящите и изходящите обаждания.\n\nДосега не сте се свързвали с(ъс) <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Яркост"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Заключване на дисплея"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Видимост"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Цвят"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Други"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index a307ea8..2ff4574 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"সমাপ্তি সময়"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"স্ট্যাটাস"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"তীব্রতা"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"বন্ধ আছে / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"কখনই নিজে থেকে চালু হবে না"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"<xliff:g id="ID_1">%1$s</xliff:g> এর সময় স্বয়ংক্রিয়ভাবে চালু হবে"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"সূর্যাস্তের সময়ে স্বয়ংক্রিয়ভাবে চালু হবে"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"চালু আছে / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"কখনই স্বয়ংক্রিয়ভাবে বন্ধ হবে না"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"<xliff:g id="ID_1">%1$s</xliff:g> এর সময় স্বয়ংক্রিয়ভাবে বন্ধ হবে"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"সূর্যোদয়ের সময় স্বয়ংক্রিয়ভাবে বন্ধ হবে"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"সূর্যাস্ত থেকে সূর্যোদয়ের সময়ে চালু করুন"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"কাস্টম সময়ে চালু করুন"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"স্ট্যাটাস"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"বন্ধ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"কখনই নিজে থেকে চালু হবে না"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"সূর্যাস্তের সময়ে নিজে থেকে চালু হবে"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"<xliff:g id="ID_1">%1$s</xliff:g> টার সময় নিজে থেকে চালু হবে"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"চালু / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"কখনই নিজে থেকে বন্ধ হবে না"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"সূর্যোদয়ের সময় নিজে থেকে বন্ধ হবে"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"<xliff:g id="ID_1">%1$s</xliff:g> টার সময় নিজে থেকে বন্ধ হবে"</string>
@@ -1611,11 +1607,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"অ্যাপ রিসেট করা যেতে পারে"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"ওয়াই-ফাই, মোবাইল ও ব্লুটুথ রিসেট"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"এগুলি সহ সমস্ত নেটওয়ার্ক সেটিংস আবার সেট করবে:\n\n"<li>"ওয়াই ফাই "</li>\n<li>"সেলুলার ডেটা "</li>\n<li>"ব্লুটুথ"</li></string>
-    <!-- no translation found for erase_euicc_data_button (728078969563311737) -->
-    <skip />
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"মুছুন"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"ডাউনলোড করা সিম মুছে ফেলা"</string>
-    <!-- no translation found for reset_esim_desc (3662444090563399131) -->
-    <skip />
+    <string name="reset_esim_desc" msgid="3662444090563399131">"এটি মোবাইল পরিষেবার কোনও প্ল্যান বাতিল করবে না। পরিবর্ত সিম ডাউনলোড করতে আপনার পরিষেবা প্রদানকারীর সাথে যোগাযোগ করুন।"</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"সেটিংস রিসেট করুন"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"সব নেটওয়ার্ক সেটিংস রিসেট করবেন? আগের সেটিংসে আর ফিরে যেতে পারবেন না।"</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"সব নেটওয়ার্ক সেটিংস রিসেট করতে ও ডাউনলোড করা সিম মুছে ফেলতে চান? এটি আগের অবস্থায় আর ফিরিয়ে আনা যাবে না।"</string>
@@ -2138,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"স্ক্রিন রিডার"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"অডিও এবং অন-স্ক্রিন পাঠ্য"</string>
     <string name="display_category_title" msgid="6638191682294461408">"ডিসপ্লে"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"ইন্টারঅ্যাকশন নিয়ন্ত্রণগুলি"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"ডাউনলোড করা অ্যাপ"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"পরীক্ষামূলক"</string>
@@ -2458,8 +2454,7 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"ট্যাবলেট স্বাভাবিকের চেয়ে বেশি ব্যবহৃত হয়েছে"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"ডিভাইস স্বাভাবিকের চেয়ে বেশি ব্যবহৃত হয়েছে"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"প্রত্যাশিত সময়ের আগেই চার্জ শেষ হয়ে যেতে পারে"</string>
-    <!-- no translation found for battery_tip_limited_temporarily_title (7152799456221596915) -->
-    <skip />
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"ব্যাটারির চার্জ অপটিমাইজ করা হচ্ছে"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"ব্যাটারির ব্যবহার কিছুক্ষণের জন্য সীমিত করা হয়েছে। আরও জানতে ট্যাপ করুন।"</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"আপনার ফোন স্বাভাবিকের চেয়ে বেশি ব্যবহার হয়েছে। প্রত্যাশিত সময়ের আগেই ব্যাটারির চার্জ শেষ হয়ে যেতে পারে।\n\nব্যাটারি বেশি ব্যবহার করে এমন অ্যাপ:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"আপনার ট্যাবলেট স্বাভাবিকের চেয়ে বেশি ব্যবহার হয়েছে। প্রত্যাশিত সময়ের আগেই ব্যাটারির চার্জ শেষ হয়ে যেতে পারে।\n\nব্যাটারি বেশি ব্যবহার করে এমন অ্যাপ:"</string>
@@ -3078,10 +3073,15 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"ব্যবহারকারীকে মুছুন"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"মুছুন"</string>
     <string name="user_guest" msgid="4545590092001460388">"অতিথি"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"অতিথি সরান"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"অতিথি সরাবেন?"</string>
+    <!-- no translation found for user_clear_guest_menu (4864362688187480452) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_menu (5064400453222497734) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_confirm_title (7526978959527761497) -->
+    <skip />
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"এই সেশনের সব অ্যাপ্লিকেশান ও ডেটা মুছে ফেলা হবে।"</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"সরান"</string>
+    <!-- no translation found for user_exit_guest_dialog_remove (8095094235815676847) -->
+    <skip />
     <string name="user_enable_calling" msgid="264875360626905535">"ফোন কলের সুবিধা চালু করুন"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"ফোন কল এবং এসএমএস চালু করবেন?"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"ব্যবহারকারীর অ্যাকাউন্ট মুছে দিন"</string>
@@ -3594,7 +3594,8 @@
     <string name="other_conversations" msgid="551178916855139870">"গুরুত্বপূর্ণ নয় এমন কথোপকথন"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"কথোপকথনে আপনার করা পরিবর্তন"</string>
     <string name="recent_conversations" msgid="471678228756995274">"সাম্প্রতিক কথোপকথন"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"সাম্প্রতিক কথোপকথন মুছুন"</string>
+    <!-- no translation found for conversation_settings_clear_recents (4246342656145488662) -->
+    <skip />
     <string name="clear" msgid="5092178335409471100">"মুছুন"</string>
     <string name="important_bubble" msgid="7911698275408390846">"গুরুত্বপূর্ণ কথোপকথন বাবল করুন"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"পুল-ডাউন শেডের উপরে গুরুত্বপূর্ণ কথোপকথন দেখায়। আপনি এগুলি বাবলে সেট করতে পারেন এবং \'বিরক্ত করবেন না\' মোড থামাতে পারেন।"</string>
@@ -4427,7 +4428,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"একাধিক ডিভাইসের সাথে কানেক্ট আছে"</string>
     <string name="demo_mode" msgid="6566167465451386728">"সিস্টেম UI ডেমো মোড"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"গাঢ় থিম"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"চালু আছে / ব্যাটারি সেভারের কারণে সাময়িকভাবে বন্ধ করা আছে"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"ব্যাটারি সেভারের কারণে সাময়িকভাবে চালু করা আছে"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"কাজ করে এমন সব অ্যাপ গাঢ় থিমে পাল্টে যাবে"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"বুঝেছি"</string>
@@ -5066,21 +5068,34 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"অভিরুচি"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"সর্বজনীন নেটওয়ার্কে কানেক্ট করুন"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"নেটওয়ার্ক কানেকশন, ইন্টারনেট, ওয়্যারলেস, ডেটা, ওয়াই-ফাই, ওয়াই-ফাই, ওয়াই-ফাই, মোবাইল ডেটা, মোবাইল, মোবাইল পরিষেবা প্রদানকারী, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"বিমানে ব্যবহার করার মতো নেটওয়ার্ক দেখুন"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"বিমান মোড বন্ধ করুন"</string>
+    <!-- no translation found for view_airplane_safe_networks (9170023210981508906) -->
+    <skip />
+    <!-- no translation found for turn_off_airplane_mode (7141986366534514443) -->
+    <skip />
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"কানেক্ট করা আছে"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"ইন্টারনেট নিজে থেকে কানেক্ট হবে না"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"অন্য কোনও নেটওয়ার্ক উপলভ্য নেই"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"কোনও নেটওয়ার্ক উপলভ্য নেই"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"বেডটাইম মোড চালু থাকায় এই সুবিধা উপলভ্য নয়"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"বিজ্ঞপ্তির দেখানোর অগ্রাধিকার রিসেট করার প্রক্রিয়া সম্পূর্ণ হয়েছে।"</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"অ্যাপ"</string>
-    <!-- no translation found for bluetooth_message_access_notification_content (2986108412562309009) -->
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"বিশ্বাসযোগ্য নয় এমন ব্লুটুথ ডিভাইস আপনার মেসেজ অ্যাক্সেস করতে চাইছে। বিশদ বিবরণের জন্য ট্যাপ করুন।"</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"মেসেজ দেখার অ্যাক্সেস দিতে চান?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"বিশ্বাসযোগ্য নয় এমন একটি ব্লুটুথ ডিভাইস, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, আপনার মেসেজ অ্যাক্সেস করতে চাইছে।.\n\nআপনি <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>-এর সাথে আগে কখনও কানেক্ট করেননি।"</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"বিশ্বাসযোগ্য নয় এমন ব্লুটুথ ডিভাইস আপনার পরিচিতি ও কল লগ অ্যাক্সেস করতে চাইছে। বিশদ বিবরণের জন্য ট্যাপ করুন।"</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"পরিচিতি ও কল লগ দেখার অ্যাক্সেস দিতে চান?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"বিশ্বাসযোগ্য নয় এমন একটি ব্লুটুথ ডিভাইস, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, আপনার পরিচিতি ও কল লগ অ্যাক্সেস করতে চাইছে। এর মধ্যে ইনকামিং ও আউটগোয়িং কলের ডেটাও আছে।\n\nআপনি <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>-এ আগে কখনও কানেক্ট করেননি।"</string>
+    <!-- no translation found for category_name_brightness (8520372392029305084) -->
     <skip />
-    <!-- no translation found for bluetooth_message_access_dialog_title (9009836130395061579) -->
+    <!-- no translation found for category_name_lock_display (7478785189102882266) -->
     <skip />
-    <!-- no translation found for bluetooth_message_access_dialog_content (6004506637437582983) -->
+    <!-- no translation found for category_name_visibility (4485030512199246405) -->
     <skip />
-    <!-- no translation found for bluetooth_phonebook_access_notification_content (4280361621526852063) -->
+    <!-- no translation found for category_name_color (937514550918977151) -->
     <skip />
-    <!-- no translation found for bluetooth_phonebook_access_dialog_title (7624607995928968721) -->
+    <!-- no translation found for category_name_others (2366006298768550310) -->
     <skip />
-    <!-- no translation found for bluetooth_phonebook_access_dialog_content (2235876209172857819) -->
+    <!-- no translation found for category_name_general (7737273712848115886) -->
     <skip />
 </resources>
diff --git a/res/values-bs/arrays.xml b/res/values-bs/arrays.xml
index edb3023..6fa21f2 100644
--- a/res/values-bs/arrays.xml
+++ b/res/values-bs/arrays.xml
@@ -215,7 +215,7 @@
     <item msgid="3441876902463317017">"GID"</item>
   </string-array>
   <string-array name="app_install_location_entries">
-    <item msgid="3771157789865587832">"Interna pohrana uređaja"</item>
+    <item msgid="3771157789865587832">"Unutrašnja pohrana uređaja"</item>
     <item msgid="5501345333507193420">"Izmjenjiva SD kartica"</item>
     <item msgid="2362840341195111674">"Neka sistem odluči"</item>
   </string-array>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index ab26f46..9514ce9 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -191,7 +191,7 @@
     <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="6189761476582690998">"USB pohrana nije aktivirana."</string>
     <string name="sdcard_settings_not_present_status" product="default" msgid="6601962586941623203">"Nema SD kartice."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="7721283102767669004">"Dostupno bajtova:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="4878190674458263222">"USB memorija se koristi kao uređaj za masovnu pohranu."</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="4878190674458263222">"USB pohrana se koristi kao uređaj za masovnu pohranu."</string>
     <string name="sdcard_settings_mass_storage_status" product="default" msgid="8850227049504860012">"SD kartica se koristi kao uređaj za masovnu pohranu."</string>
     <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="1053258530368541571">"Sigurno je izbaciti USB."</string>
     <string name="sdcard_settings_unmounted_status" product="default" msgid="5813940671700138561">"Sada je sigurno ukloniti SD karticu."</string>
@@ -689,7 +689,7 @@
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Administrator uređaja ne dozvoljava korištenje nedavne lozinke"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Nije dozvoljen rastući, opadajući ili ponavljajući niz cifara"</string>
-    <string name="lockpassword_confirm_label" msgid="560897521093566777">"Potvrdi"</string>
+    <string name="lockpassword_confirm_label" msgid="560897521093566777">"Potvrdite"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Otkaži"</string>
     <string name="lockpassword_clear_label" msgid="311359833434539894">"Obriši"</string>
     <string name="lockpassword_credential_changed" msgid="5934778179732392028">"Zaključavanje ekrana je već promijenjeno. Pokušajte ponovo s novim zaključavanjem ekrana."</string>
@@ -1249,11 +1249,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Vrijeme završetka"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Status"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intenzitet"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Isključeno / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Neće se nikada automatski uključiti"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Automatski će se uključiti u <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Automatski će se uključiti u sumrak"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Uključeno / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Neće se nikada automatski isključiti"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Automatski će se isključiti u <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Automatski će se isključiti u svitanje"</string>
@@ -1276,11 +1274,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Uključeno od sumraka do svitanja"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Uključuje se u zadano vrijeme"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Status"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Isključeno / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Neće se nikada automatski uključiti"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Automatski će se uključiti u sumrak"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Automatski će se uključiti u <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Uključeno / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Neće se nikada automatski isključiti"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Automatski će se isključiti u svitanje"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Automatski će se isključiti u <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -1420,7 +1416,7 @@
     <string name="status_serial_number" msgid="9060064164331466789">"Serijski broj"</string>
     <string name="status_up_time" msgid="1274778533719495438">"Vrijeme aktivnosti"</string>
     <string name="status_awake_time" msgid="2573925324168081586">"Vrijeme aktivnosti"</string>
-    <string name="internal_memory" msgid="1869518160077033848">"Interna pohrana"</string>
+    <string name="internal_memory" msgid="1869518160077033848">"Unutrašnja pohrana"</string>
     <string name="sd_memory" product="nosdcard" msgid="5456718463397723781">"USB pohrana"</string>
     <string name="sd_memory" product="default" msgid="3098344183202722455">"SD kartica"</string>
     <string name="memory_available" msgid="712528795743654737">"Dostupno"</string>
@@ -1457,7 +1453,7 @@
     <string name="dlg_confirm_unmount_text" product="default" msgid="3887768438615563697">"Ako deaktivirate SD karticu, neke aplikacije koje koristite će prestati raditi i može se desiti da budu nedostupne dok ponovo ne aktivirate SD karticu."</string>
     <string name="dlg_error_unmount_title" product="nosdcard" msgid="2205587942165199845"></string>
     <string name="dlg_error_unmount_title" product="default" msgid="2205587942165199845"></string>
-    <string name="dlg_error_unmount_text" product="nosdcard" msgid="7876201891724279436">"USB memorija se ne može isključiti. Pokušajte ponovo kasnije."</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="7876201891724279436">"USB pohrana se ne može isključiti. Pokušajte ponovo kasnije."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="2185659901137961711">"Nije bilo moguće odvojiti SD karticu. Pokušajte ponovo kasnije."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="5932607205977999175">"USB pohrana će biti deaktivirana."</string>
     <string name="unmount_inform_text" product="default" msgid="716578785262713312">"SD kartica će biti deaktivirana."</string>
@@ -1522,9 +1518,9 @@
     <string name="storage_wizard_init_title" msgid="9036374223934708619">"Podesite uređaj <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="6540132491909241713">"Koristiti kao prijenosnu memoriju"</string>
     <string name="storage_wizard_init_external_summary" msgid="5807552934494462984">"Za premještanje fotografija i drugih medija s jednog uređaja na drugi."</string>
-    <string name="storage_wizard_init_internal_title" msgid="3256355049992147270">"Koristi kao unutrašnju memoriju"</string>
+    <string name="storage_wizard_init_internal_title" msgid="3256355049992147270">"Koristi kao unutrašnju pohranu"</string>
     <string name="storage_wizard_init_internal_summary" msgid="2283798331883929674">"Za memorisanje bilo čega samo na ovaj uređaj uključujući aplikacije i fotografije. Zahtijeva formatiranje koje sprečavaju da radi sa drugim uređajima."</string>
-    <string name="storage_wizard_format_confirm_title" msgid="4898014527956178762">"Formatirajte kao unutr. memoriju"</string>
+    <string name="storage_wizard_format_confirm_title" msgid="4898014527956178762">"Formatirajte kao unutr. pohranu"</string>
     <string name="storage_wizard_format_confirm_body" msgid="5514665245241830772">"To zahtijeva da <xliff:g id="NAME_0">^1</xliff:g> bude formatirana da bi bila sigurna.\n\nNakon formatiranja, ova <xliff:g id="NAME_1">^1</xliff:g> će raditi samo na ovom uređaju. \n\n"<b>"Formatiranje briše sve podatke koji se trenutno na njoj nalaze <xliff:g id="NAME_2">^1</xliff:g>."</b>" Da biste izbjegli gubljenje podataka, razmotrite kreiranje sigurnosne kopije."</string>
     <string name="storage_wizard_format_confirm_public_title" msgid="649252654496577680">"Formatirajte kao pren. memoriju"</string>
     <string name="storage_wizard_format_confirm_public_body" msgid="6219883780307218266">"Ovo zahtijeva da se <xliff:g id="NAME_0">^1</xliff:g> formatira. \n\n"<b>"Formatiranjem se brišu svi podaci trenutno pohranjeni na uređaju <xliff:g id="NAME_1">^1</xliff:g>."</b>" Da ne biste izgubili podatke, razmislite o kreiranju sigurnosne kopije."</string>
@@ -1532,7 +1528,7 @@
     <string name="storage_wizard_format_progress_title" msgid="9170393018855949774">"Formatiranje <xliff:g id="NAME">^1</xliff:g>..."</string>
     <string name="storage_wizard_format_progress_body" msgid="1044024044955390417">"Nemojte uklanjati pohranu <xliff:g id="NAME">^1</xliff:g> dok se formatira."</string>
     <string name="storage_wizard_migrate_title" msgid="3013711737005104623">"Premjestite pod. u novu memoriju"</string>
-    <string name="storage_wizard_migrate_body" msgid="1630853797296198275">"Možete premjestiti slike, fajlove i neke aplikacije na novi uređaj <xliff:g id="NAME">^1</xliff:g>. \n\nPremještanje traje otprilike <xliff:g id="TIME">^2</xliff:g> te će osloboditi <xliff:g id="SIZE">^3</xliff:g> unutrašnje memorije. Neke aplikacije neće funkcionirati dok je ovo u toku."</string>
+    <string name="storage_wizard_migrate_body" msgid="1630853797296198275">"Možete premjestiti slike, fajlove i neke aplikacije na novi uređaj <xliff:g id="NAME">^1</xliff:g>. \n\nPremještanje traje otprilike <xliff:g id="TIME">^2</xliff:g> te će osloboditi <xliff:g id="SIZE">^3</xliff:g> unutrašnje pohrane. Neke aplikacije neće funkcionirati dok je ovo u toku."</string>
     <string name="storage_wizard_migrate_now" msgid="175023718337037181">"Premjesti sada"</string>
     <string name="storage_wizard_migrate_later" msgid="6573789572520980112">"Premjesti kasnije"</string>
     <string name="storage_wizard_migrate_confirm_title" msgid="255346780598924540">"Premjesti podatke sada"</string>
@@ -1646,14 +1642,14 @@
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Preuzete SIM-ove nije moguće izbrisati zbog greške.\n\nPonovo pokrenite uređaj i pokušajte ponovo."</string>
     <string name="main_clear_title" msgid="277664302144837723">"Potpuno izbriši sve podatke (vraćanje na fabričke postavke)"</string>
     <string name="main_clear_short_title" msgid="4752094765533020696">"Potpuno izbriši sve podatke (vraćanje na fabričke postavke)"</string>
-    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Ovim će se u potpunosti izbrisati svi podaci "<b>"unutrašnje memorije"</b>" tableta, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"podatke i postavke sistema i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
-    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Ovim će se potpuno izbrisati svi podaci "<b>"unutrašnje memorije"</b>" telefona, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"podatke i postavke sistema i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Ovim će se u potpunosti izbrisati svi podaci "<b>"unutrašnje pohrane"</b>" tableta, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"podatke i postavke sistema i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Ovim će se potpuno izbrisati svi podaci "<b>"unutrašnje pohrane"</b>" telefona, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"podatke i postavke sistema i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
     <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Trenutno ste prijavljeni na sljedećim računima:\n"</string>
     <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Drugi korisnici su prisutni na ovom uređaju.\n"</string>
     <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"muziku"</li>\n<li>"fotografije"</li>\n<li>"ostale korisničke podatke"</li></string>
     <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-ove"</li></string>
     <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Ovim se neće otkazati vaš plan usluga mobilnog operatera."</string>
-    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Da obrišete muziku, slike i druge korisničke podatke, potrebno je potpuno izbrisati podatke s "<b>"USB memorije"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Da obrišete muziku, slike i druge korisničke podatke, potrebno je potpuno izbrisati podatke s "<b>"USB pohrane"</b>"."</string>
     <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Da obrišete muziku, slike i druge korisničke podatke, potrebno je potpuno izbrisati podatke sa "<b>"SD kartice"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Izbriši USB pohranu"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Izbriši SD karticu"</string>
@@ -1974,7 +1970,7 @@
     <string name="not_installed" msgid="5074606858798519449">"Nije instal. za ovog korisnika"</string>
     <string name="installed" msgid="2837449358488825884">"Instalirano"</string>
     <string name="no_applications" msgid="985069304755391640">"Nema aplikacija."</string>
-    <string name="internal_storage" msgid="999496851424448809">"Interna pohrana"</string>
+    <string name="internal_storage" msgid="999496851424448809">"Unutrašnja pohrana"</string>
     <string name="recompute_size" msgid="1098091228370999128">"Ponovno izračunavanje veličine…"</string>
     <string name="clear_data_dlg_title" msgid="180446967743732410">"Izbrisati podatke aplikacija?"</string>
     <string name="clear_data_dlg_text" msgid="7870723948123690332">"Svi podaci ove aplikacije će biti trajno izbrisani. To uključuje sve fajlove, postavke, račune, baze podataka itd."</string>
@@ -2160,6 +2156,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Čitači ekrana"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Zvuk i tekst na ekranu"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Prikaz"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Kontrole za interakciju"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Preuzete aplikacije"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Eksperimentalno"</string>
@@ -3118,10 +3116,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Izbriši korisnika"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Izbriši"</string>
     <string name="user_guest" msgid="4545590092001460388">"Gost"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Uklonite gosta"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Ukloniti gosta?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Obriši podatke gosta"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Završi sesiju gosta"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Završiti sesiju gosta?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Sve aplikacije i podaci iz ove sesije će biti izbrisani."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Ukloniti"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Završi sesiju"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Uključi telefonske pozive"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Uključi telefonske pozive i SMS-ove"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Izbriši korisnika"</string>
@@ -3636,7 +3635,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Razgovori koji nisu prioritetni"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Razgovori koje ste mijenjali"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Nedavni razgovori"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Obriši nedavno"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Obriši sve nedavno"</string>
     <string name="clear" msgid="5092178335409471100">"Obriši"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Smjesti prioritetne razgovore u oblačiće"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Prioritetni razgovori se prikazuju na vrhu padajuće trake. Razgovore možete postaviti i u oblačić i prekinuti funkciju Ne ometaj."</string>
@@ -3994,7 +3993,7 @@
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Podržani linkovi"</string>
     <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Ostale zadane vrijednosti"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"Iskorišteno <xliff:g id="SIZE">%1$s</xliff:g> (<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>)"</string>
-    <string name="storage_type_internal" msgid="979243131665635278">"unutrašnja memorija"</string>
+    <string name="storage_type_internal" msgid="979243131665635278">"unutrašnja pohrana"</string>
     <string name="storage_type_external" msgid="125078274000280821">"vanjska pohrana"</string>
     <string name="data_summary_format" msgid="8802057788950096650">"Iskorišt.: <xliff:g id="SIZE">%1$s</xliff:g> od <xliff:g id="DATE">%2$s</xliff:g>"</string>
     <string name="storage_used" msgid="2591194906751432725">"Iskorištena memorija"</string>
@@ -4494,7 +4493,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Povezan s više uređaja"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Način rada za demonstraciju Sistemskog UI-a"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Tamna tema"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Uključeno/Privremeno onemogućeno zbog Uštede baterije"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Privremeno uključeno zbog Uštede baterije"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Podržane aplikacije će se također prebaciti na tamnu temu"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Razumijem"</string>
@@ -5146,15 +5146,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Postavke"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Povežite se s javnim mrežama"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"mrežna veza, internet, bežični, podaci, wifi, wi-fi, wi fi, celularni, mobilni, mobilni operater, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Pogledajte mreže sigurne za avion"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Isključite način rada u avionu"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Prikaži mreže načina rada u avionu"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Isključi način rada u avionu"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Povezano"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Nije se moguće automatski povezati s internetom"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Druge mreže nisu dostupne"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Nema dostupnih mreža"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Nedostupno jer je uključen način rada za spavanje"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Poništavanje važnosti obavještenja je završeno."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Aplikacije"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Nepouzdani uređaj želi pristupiti vašim porukama. Dodirnite za detalje."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Dozvoliti pristup porukama?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Nepouzdani Bluetooth uređaj, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], želi pristupiti vašim porukama.\n\nNiste se prije povezivali s uređajem [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Nepouzdani Bluetooth uređaj, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, želi pristupiti vašim porukama.\n\nNiste se prije povezivali s uređajem <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Nepouzdani uređaj želi pristupiti vašim kontaktima i zapisniku poziva. Dodirnite za detalje."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Dozvoliti pristup kontaktima i zapisniku poziva?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Nepouzdani Bluetooth uređaj, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], želi pristupiti vašim kontaktima i zapisniku poziva. To obuhvata podatke o dolaznim i odlaznim pozivima.\n\nNiste se prije povezivali s uređajem [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Nepouzdani Bluetooth uređaj, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, želi pristupiti vašim kontaktima i zapisniku poziva. To obuhvata podatke o dolaznim i odlaznim pozivima.\n\nNiste se prije povezivali s uređajem <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Osvjetljenje"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Zaključavanje ekrana"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Vidljivost"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Boja"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Ostalo"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 4072467..ba2cbb1 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Hora de finalització"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Estat"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intensitat"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Desactivat / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"No s\'activarà mai automàticament"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"S\'activarà automàticament a les <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"S\'activarà automàticament al vespre"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Activat / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"No es desactivarà mai automàticament"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Es desactivarà automàticament a les <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Es desactivarà automàticament a l\'alba"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"S\'activa del vespre a l\'alba"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"S\'activa a una hora personalitzada"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Estat"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Desactivat / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"No s\'activarà mai automàticament"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"S\'activarà automàticament al vespre"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"S\'activarà automàticament a les <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Activat / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"No es desactivarà mai automàticament"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Es desactivarà automàticament a l\'alba"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Es desactivarà automàticament a les <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Lectors de pantalla"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Àudio i text en pantalla"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Pantalla"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Controls d\'interacció"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Aplicacions baixades"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Experimental"</string>
@@ -2456,7 +2454,7 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"La tauleta s\'ha utilitzat més del que és habitual"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"El dispositiu s\'ha utilitzat més del que és habitual"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Pot ser que la bateria s\'esgoti massa ràpid"</string>
-    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"S\'està optimitzant per a l\'estat de la bateria"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"S\'està optimitzant per preservar l\'estat de la bateria"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Bateria limitada temporalment. Toca per obtenir més informació."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"El telèfon s\'ha fet servir més del que és habitual i és possible que la bateria s\'esgoti abans del previst.\n\nAplicacions que han consumit més bateria:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"La tauleta s\'ha fet servir més del que és habitual i és possible que la bateria s\'esgoti abans del previst.\n\nAplicacions que han consumit més bateria:"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Suprimeix l\'usuari"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Suprimeix"</string>
     <string name="user_guest" msgid="4545590092001460388">"Convidat"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Suprimeix el convidat"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Vols suprimir el convidat?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Esborra les dades dels convidats"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Finalitza la sessió de convidat"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Vols finalitzar la sessió de convidat?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Totes les aplicacions i les dades d\'aquesta sessió se suprimiran."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Suprimeix"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Finalitza la sessió"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Activa les trucades telefòniques"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Activa les trucades telefòniques i els SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Suprimeix l\'usuari"</string>
@@ -3099,16 +3098,16 @@
     <string name="nfc_payment_app_and_desc" msgid="2607417639227030398">"<xliff:g id="APP">%1$s</xliff:g> - <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="nfc_payment_use_default" msgid="788899906312142803">"Utilitza l\'aplicació predeterminada"</string>
     <string name="nfc_payment_favor_default" msgid="4508491832174644772">"Sempre"</string>
-    <string name="nfc_payment_favor_open" msgid="8554643344050373346">"Tret quan hi hagi oberta una altra app per pagar"</string>
+    <string name="nfc_payment_favor_open" msgid="8554643344050373346">"Tret quan hi hagi oberta una altra aplicació de pagaments"</string>
     <string name="nfc_payment_pay_with" msgid="3001320460566523453">"En un terminal sense contacte, paga amb:"</string>
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Pagar al terminal"</string>
-    <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Configura una aplicació per pagar. A continuació, apropa la part posterior del telèfon a un terminal amb el símbol de pagament sense contacte."</string>
+    <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Configura una aplicació de pagaments. A continuació, apropa la part posterior del telèfon a un terminal amb el símbol de pagament sense contacte."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Entesos"</string>
     <string name="nfc_more_title" msgid="1041094244767216498">"Més…"</string>
-    <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Defineix una aplicació per pagar predeterminada"</string>
-    <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Actualitza l\'aplicació de pagament predeterminada"</string>
+    <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Defineix una aplicació de pagaments predeterminada"</string>
+    <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Actualitza l\'aplicació de pagaments predeterminada"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"En un terminal sense contacte, paga amb <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="nfc_payment_set_default_instead_of" msgid="565237441045013280">"En un terminal sense contacte, paga amb <xliff:g id="APP_0">%1$s</xliff:g>.\n\nAixò substitueix <xliff:g id="APP_1">%2$s</xliff:g> com a aplicació per pagar predeterminada."</string>
+    <string name="nfc_payment_set_default_instead_of" msgid="565237441045013280">"En un terminal sense contacte, paga amb <xliff:g id="APP_0">%1$s</xliff:g>.\n\nAixò substitueix <xliff:g id="APP_1">%2$s</xliff:g> com a aplicació de pagaments predeterminada."</string>
     <string name="nfc_payment_btn_text_set_deault" msgid="1821065137209590196">"Defineix com a predeterminada"</string>
     <string name="nfc_payment_btn_text_update" msgid="5159700960497443832">"Actualitza"</string>
     <string name="restriction_settings_title" msgid="4293731103465972557">"Restriccions"</string>
@@ -3233,7 +3232,7 @@
     <string name="connected_devices_dashboard_android_auto_no_driving_mode_summary" msgid="6426996842202276640">"Bluetooth, Android Auto i NFC"</string>
     <string name="connected_devices_dashboard_android_auto_no_nfc_no_driving_mode" msgid="1672426693308438634">"Bluetooth i Android Auto"</string>
     <string name="nfc_and_payment_settings_payment_off_nfc_off_summary" msgid="7132040463607801625">"No està disponible perquè la funció NFC està desactivada"</string>
-    <string name="nfc_and_payment_settings_no_payment_installed_summary" msgid="4879818114908207465">"Per utilitzar aquesta funció, primer instal·la una aplicació per pagar"</string>
+    <string name="nfc_and_payment_settings_no_payment_installed_summary" msgid="4879818114908207465">"Per utilitzar aquesta funció, primer instal·la una aplicació de pagaments"</string>
     <string name="app_and_notification_dashboard_title" msgid="2861781687031832943">"Aplicacions i notificacions"</string>
     <string name="app_and_notification_dashboard_summary" msgid="8047683010984186106">"Aplicacions recents, aplicacions predeterminades"</string>
     <string name="notification_settings_work_profile" msgid="6076211850526353975">"Les aplicacions del perfil de treball no tenen accés a les notificacions."</string>
@@ -3269,7 +3268,7 @@
     <string name="keywords_text_to_speech_output" msgid="6728080502619011668">"velocitat, idioma, predeterminat, parla, parlar, síntesi de veu, accessibilitat, lector de pantalla, invident"</string>
     <string name="keywords_date_and_time" msgid="4402136313104901312">"rellotge, 24 hores"</string>
     <string name="keywords_network_reset" msgid="4075670452112218042">"restablir, restaurar, fàbrica"</string>
-    <string name="keywords_factory_data_reset" msgid="4979623326958976773">"eliminar, suprimir, restaurar, esborrar, retirar, restablir la configuració de fàbrica"</string>
+    <string name="keywords_factory_data_reset" msgid="4979623326958976773">"netejar, suprimir, restaurar, esborrar, retirar, restablir la configuració de fàbrica"</string>
     <string name="keywords_printing" msgid="3528250034669909466">"impressora"</string>
     <string name="keywords_sounds" msgid="1850691834585575875">"so d\'altaveu, altaveu, volum, silenciar, silenci, àudio, música"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="1500312884808362467">"no molestis, interrompeixis interrupció, pausa"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Converses no prioritàries"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Converses en què has fet canvis"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Converses recents"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Esborra recents"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Esborra tots els recents"</string>
     <string name="clear" msgid="5092178335409471100">"Esborra"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Mostra les converses prioritàries com a bombolles"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Les converses prioritàries es mostren a la part superior de l\'àrea desplegable. També pots definir que es mostrin com a bombolles i interrompin el mode No molestis."</string>
@@ -4407,8 +4406,8 @@
       <item quantity="one">1 aplicació pot utilitzar dades sense restricció</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Mostra\'n més"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Vols esborrar les dades d\'usuari i convertir-les en encriptació de fitxers?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Esborra i converteix"</string>
+    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Vols netejar les dades d\'usuari i convertir-les en encriptació de fitxers?"</string>
+    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Esborra i neteja"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Restableix la limitació de freqüència de ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"S\'ha restablert la limitació de freqüència de ShortcutManager"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Controla la informació de la pantalla de bloqueig"</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Connectat a diversos dispositius"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Mode de demostració de la IU del sistema"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Tema fosc"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Activat / Desactivat temporalment per l\'estalvi de bateria"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Activat temporalment per l\'estalvi de bateria"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Les aplicacions compatibles també canviaran al tema fosc"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Entesos"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferències"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Connecta\'t a xarxes públiques"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"connexió a la xarxa, internet, sense fil, dades, wifi, wi‑fi, wi fi, mòbils, mòbil, operador de telefonia mòbil, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Mostra xarxes segures per al mode d\'avió"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Desactiva el mode d\'avió"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Mostra les xarxes del mode d\'avió"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Desactiva el mode d\'avió"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Connectat"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"No es connectarà automàticament a Internet"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"No hi ha cap altra xarxa disponible"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"No hi ha cap xarxa disponible"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"No està disponible perquè el mode d\'hora de dormir està activat"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"S\'ha completat el restabliment de la importància de les notificacions."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Aplicacions"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Un dispositiu que no és de confiança vol accedir als teus missatges. Toca per veure més informació."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Vols permetre l\'accés als missatges?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Un dispositiu Bluetooth que no és de confiança, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], vol accedir als teus missatges. \n\nNo t\'has connectat a [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] abans."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Un dispositiu Bluetooth que no és de confiança, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, vol accedir als teus missatges.\n\nNo t\'has connectat a <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> abans."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Un dispositiu que no és de confiança vol accedir als teus contactes i al registre de trucades. Toca per veure més informació."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Vols permetre l\'accés als contactes i al registre de trucades?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Un dispositiu Bluetooth que no és de confiança, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], vol accedir als teus contactes i al registre de trucades. Això inclou dades sobre les trucades entrants i sortints.\n\nNo t\'has connectat a [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] abans."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Un dispositiu Bluetooth que no és de confiança, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, vol accedir als teus contactes i al registre de trucades. Això inclou dades sobre les trucades entrants i sortints.\n\nNo t\'has connectat a <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> abans."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Brillantor"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Pantalla de bloqueig"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Visibilitat"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Color"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Altres"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 1dc2e95..1699cc3 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -1269,11 +1269,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Čas ukončení"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Stav"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intenzita"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Vypnuto / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Nikdy se automaticky nezapne"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Zapne se automaticky v <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Zapne se automaticky za soumraku"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Zapnuto / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Nikdy se automaticky nevypne"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Vypne se automaticky v <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Vypne se automaticky za úsvitu"</string>
@@ -1296,11 +1294,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Zapne se od soumraku do úsvitu"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Zapne se ve zvoleném čase"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Stav"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Vypnuto / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Nikdy se automaticky nezapne"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Zapne se automaticky za soumraku"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Zapne se automaticky v <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Zapnuto / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Nikdy se automaticky nevypne"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Vypne se automaticky za úsvitu"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Vypne se automaticky v <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2184,6 +2180,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Čtečky obrazovky"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Zvuk a text na obrazovce"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Zobrazení"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Interaktivní ovládací prvky"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Stažené aplikace"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Experimentální"</string>
@@ -3161,10 +3159,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Smazat uživatele"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Smazat"</string>
     <string name="user_guest" msgid="4545590092001460388">"Host"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Odstranit hosta"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Odstranit hosta?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Vymazat údaje hosta"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Ukončení relace hosta"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Ukončit relaci hosta?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Veškeré aplikace a data v této relaci budou vymazána."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Odstranit"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Ukončit relaci"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Zapnout telefonní hovory"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Zapnout telefonní hovory a SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Smazání uživatele"</string>
@@ -3681,7 +3680,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Neprioritní konverzace"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Konverzace, ve kterých jste provedli změny"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Poslední konverzace"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Vymazat poslední"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Vymazat vše nedávné"</string>
     <string name="clear" msgid="5092178335409471100">"Vymazat"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Prioritní konverzace automaticky zobrazovat jako bubliny"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Prioritní konverzace se zobrazují v horní části vysouvacího panelu. Můžete také nastavit, aby se zobrazovaly v bublinách a v režimu Nerušit."</string>
@@ -4564,7 +4563,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Připojeno k několika zařízením"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Ukázkový režim uživatelského rozhraní systému"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Tmavý motiv"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Zapnuto / Dočasně deaktivováno spořičem baterie"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Dočasně vypnuto spořičem baterie"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Na tmavý motiv se přepnou i podporované aplikace"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Rozumím"</string>
@@ -5229,15 +5229,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Předvolby"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Připojovat k veřejným sítím"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"připojení k síti, internet, bezdrátové, data, wifi, wi-fi, wi fi, mobilní síť, mobilní operátor, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Zobrazit sítě bezpečné pro letadlo"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Vypnout režim Letadlo"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Zobrazit sítě v režimu Letadlo"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Vypnout režim Letadlo"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Připojeno"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet se nebude automaticky připojovat"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Žádné další sítě nejsou k dispozici"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Nejsou k dispozici žádné sítě"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Nedostupné, protože je zapnutý režim večerky"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Reset důležitosti oznámení byl dokončen."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Aplikace"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Nedůvěryhodné zařízení žádá o přístup k vašim zprávám. Podrobnosti zobrazíte klepnutím."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Chcete povolit přístup ke zprávám?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Nedůvěryhodné zařízení Bluetooth [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] žádá o přístup k vašim zprávám.\n\nK zařízení [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] jste se ještě nikdy nepřipojili."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Nedůvěryhodné zařízení Bluetooth <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> žádá o přístup k vašim zprávám.\n\nK zařízení <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> jste se ještě nikdy nepřipojili."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Nedůvěryhodné zařízení žádá o přístup k vašim kontaktům a seznamu hovorů. Podrobnosti zobrazíte klepnutím."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Chcete povolit přístup ke kontaktům a seznamu hovorů?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Nedůvěryhodné zařízení Bluetooth [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] žádá o přístup k vašim kontaktům a seznamu hovorů. To zahrnuje data o příchozích a odchozích hovorech.\n\nK zařízení [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] jste se ještě nikdy nepřipojili."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Nedůvěryhodné zařízení Bluetooth <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> žádá o přístup k vašim kontaktům a seznamu hovorů. To zahrnuje data o příchozích a odchozích hovorech.\n\nK zařízení <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> jste se ještě nikdy nepřipojili."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Jas"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Zamknutí displeje"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Viditelnost"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Barva"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Jiné"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index c90a66e..1cce59d 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Sluttidspunkt"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Status"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intensitet"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Fra/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Aktiveres aldrig automatisk"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Aktiveres automatisk kl. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Aktiveres automatisk ved solnedgang"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Til – <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Deaktiveres aldrig automatisk"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Deaktiveres automatisk kl. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Deaktiveres automatisk ved solopgang"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Aktiveres fra solnedgang til solopgang"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Aktiveres på valgt tidspunkt"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Status"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Fra/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Aktiveres aldrig automatisk"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Aktiveres automatisk ved solnedgang"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Aktiveres automatisk kl. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Til – <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Deaktiveres aldrig automatisk"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Deaktiveres automatisk ved solopgang"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Deaktiveres automatisk kl. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Skærmlæsere"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Lyd og tekst på skærmen"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Visning"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Interaktionsstyring"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Apps, du har downloadet"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Eksperimentel"</string>
@@ -2456,7 +2454,7 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Din tablet er blevet brugt mere end normalt"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Enheden er blevet brugt mere end normalt"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Batteriet aflades muligvis hurtigere end normalt"</string>
-    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optimerer på baggrund af batteritilstanden"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optimerer batteritilstanden"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Batteriet er midlertidigt begrænset. Tryk for at få flere oplysninger."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Din telefon er blevet brugt mere end normalt. Dit batteri aflades muligvis hurtigere end forventet.\n\nHer kan du se apps sorteret efter batteriforbrug:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Din tablet er blevet brugt mere end normalt. Dit batteri aflades muligvis hurtigere end forventet.\n\nHer kan du se apps sorteret efter batteriforbrug:"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Slet bruger"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Slet"</string>
     <string name="user_guest" msgid="4545590092001460388">"Gæst"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Fjern gæst"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Vil du fjerne gæsten?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Ryd gæstedata"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Afslut gæstesessionen"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Vil du afslutte gæstesessionen?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Alle apps og data i denne session slettes."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Fjern"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Afslut sessionen"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Aktivér telefonopkald"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Aktivér telefonopkald og sms"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Slet bruger"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Ikke-prioriterede samtaler"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Samtaler, du har ændret"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Seneste samtaler"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Ryd seneste"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Ryd alle seneste"</string>
     <string name="clear" msgid="5092178335409471100">"Ryd"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Vis prioriterede samtaler som bobler"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Prioriterede samtaler vises øverst i rullepanelet. Du kan også vise dem som bobler og afbryde Forstyr ikke."</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Forbundet med flere enheder"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Demotilstand for systemets brugerflade"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Mørkt tema"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Til – Midlertidigt deaktiveret af batterisparefunktionen"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Midlertidigt aktiveret af batterisparefunktionen"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Understøttede apps skifter også til mørkt tema"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"OK"</string>
@@ -5068,15 +5068,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Præferencer"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Opret forbindelse til offentlige netværk"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"netværksforbindelse, internet, trådløs, data, wifi, wi-fi, mobilnetværk, mobil, mobilselskab, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Se netværk til brug i fly"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Deaktiver flytilstand"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Se netværk til flytilstand"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Deaktiver flytilstand"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Forbundet"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Der oprettes ikke automatisk internetforbindelse"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Der er ingen andre tilgængelige netværk"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Der er ingen tilgængelige netværk"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Ikke tilgængelig, da sengetidstilstand er aktiveret"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Vigtigheden af notifikationer blev nulstillet."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Apps"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"En ikke-godkendt enhed vil gerne have adgang til dine beskeder. Tryk for at få flere oplysninger."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Vil du give adgang til beskeder?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"En ikke-godkendt Bluetooth-enhed, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], vil gerne have adgang til dine beskeder.\n\nDu har ikke oprettet forbindelse til [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] før."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"En ikke-godkendt Bluetooth-enhed, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, vil gerne have adgang til dine beskeder.\n\nDu har ikke oprettet forbindelse til <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> før."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"En ikke-godkendt enhed vil gerne have adgang til dine kontakter og din opkaldsliste. Tryk for at få flere oplysninger."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Vil du give adgang til kontakter og opkaldsliste?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"En ikke-godkendt Bluetooth-enhed, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], vil gerne have adgang til dine kontakter og din opkaldsliste. Dette omfatter data om indgående og udgående opkald.\n\nDu har ikke oprettet forbindelse til [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] før."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"En ikke-godkendt Bluetooth-enhed, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, vil gerne have adgang til dine kontakter og din opkaldsliste. Dette omfatter data om indgående og udgående opkald.\n\nDu har ikke oprettet forbindelse til <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> før."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Lysstyrke"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Låseskærm"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Synlighed"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Farve"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Andre"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index dc99c3a..dbf99a6 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1230,11 +1230,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Ende"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Status"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intensität"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Aus / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Wird nie automatisch aktiviert"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Wird automatisch um <xliff:g id="ID_1">%1$s</xliff:g> aktiviert"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Wird automatisch bei Sonnenuntergang aktiviert"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"An / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Wird nie automatisch deaktiviert"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Wird automatisch um <xliff:g id="ID_1">%1$s</xliff:g> deaktiviert"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Wird automatisch bei Sonnenaufgang deaktiviert"</string>
@@ -1257,11 +1255,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"An von Sonnenuntergang bis -aufgang"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Zu benutzerdefinierter Zeit"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Status"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Aus / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Wird nie automatisch aktiviert"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Wird automatisch bei Sonnenuntergang aktiviert"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Wird automatisch um <xliff:g id="ID_1">%1$s</xliff:g> aktiviert"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"An / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Wird nie automatisch deaktiviert"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Wird automatisch bei Sonnenaufgang deaktiviert"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Wird automatisch um <xliff:g id="ID_1">%1$s</xliff:g> deaktiviert"</string>
@@ -2137,6 +2133,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Screenreader"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audiodienste und Text auf dem Bildschirm"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Bildschirm"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Interaktionssteuerung"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Heruntergeladene Apps"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Experimentell"</string>
@@ -3076,10 +3074,15 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Nutzer löschen"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Löschen"</string>
     <string name="user_guest" msgid="4545590092001460388">"Gast"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Gast entfernen"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Gast entfernen?"</string>
+    <!-- no translation found for user_clear_guest_menu (4864362688187480452) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_menu (5064400453222497734) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_confirm_title (7526978959527761497) -->
+    <skip />
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Alle Apps und Daten in dieser Sitzung werden gelöscht."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Entfernen"</string>
+    <!-- no translation found for user_exit_guest_dialog_remove (8095094235815676847) -->
+    <skip />
     <string name="user_enable_calling" msgid="264875360626905535">"Telefonieren zulassen"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Telefonieren &amp; SMS zulassen"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Nutzer löschen"</string>
@@ -3592,7 +3595,8 @@
     <string name="other_conversations" msgid="551178916855139870">"Unterhaltungen ohne Priorität"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Unterhaltungen, an denen Änderungen vorgenommen wurden"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Neueste Unterhaltungen"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Neueste löschen"</string>
+    <!-- no translation found for conversation_settings_clear_recents (4246342656145488662) -->
+    <skip />
     <string name="clear" msgid="5092178335409471100">"Löschen"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Vorrangige Unterhaltungen als Bubble anzeigen"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Vorrangige Unterhaltungen werden oben in der Benachrichtigungsleiste angezeigt. Du kannst auch einstellen, dass sie als Bubbles angezeigt werden oder den \"Bitte nicht stören\"-Modus unterbrechen können."</string>
@@ -4425,7 +4429,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Mit mehreren Geräten verbunden"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Demomodus der System-UI"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Dunkles Design"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"An / Wegen Energiesparmodus vorübergehend deaktiviert"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Wegen Energiesparmodus vorübergehend aktiviert"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Unterstützte Apps wechseln ebenfalls zum dunklen Design"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Ok"</string>
@@ -5064,15 +5069,39 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Einstellungen"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Mit öffentlichen Netzwerken verbinden"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"netzwerkverbindung, internet, kabellos, drahtlos, daten, wlan, w-lan, mobilfunk, mobil, mobilfunkanbieter, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Flugsichere Netzwerke anzeigen"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Flugmodus deaktivieren"</string>
+    <!-- no translation found for view_airplane_safe_networks (9170023210981508906) -->
+    <skip />
+    <!-- no translation found for turn_off_airplane_mode (7141986366534514443) -->
+    <skip />
+    <!-- no translation found for preference_summary_default_combination (4643585915107796253) -->
+    <skip />
+    <!-- no translation found for mobile_data_connection_active (2422223108911581552) -->
+    <skip />
+    <!-- no translation found for mobile_data_off_summary (3841411571485837651) -->
+    <skip />
+    <!-- no translation found for non_carrier_network_unavailable (9031567407964127997) -->
+    <skip />
+    <!-- no translation found for all_network_unavailable (1163897808282057496) -->
+    <skip />
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Nicht verfügbar, weil der Modus „Schlafenszeit“ aktiviert ist"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Die Wichtigkeit von Benachrichtigungen wurde zurückgesetzt."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Apps"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Ein nicht vertrauenswürdiges Gerät fordert Zugriff auf deine Nachrichten an. Weitere Informationen."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Möchtest du den Zugriff auf Nachrichten zulassen?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Ein nicht vertrauenswürdiges Bluetooth-Gerät, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, fordert Zugriff auf deine Nachrichten an.\n\nDu warst bisher noch nicht mit <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> verbunden."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Ein nicht vertrauenswürdiges Bluetooth-Gerät (<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>) möchte auf deine Nachrichten zugreifen.\n\nDu warst bisher noch nicht mit <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> verbunden."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Ein nicht vertrauenswürdiges Gerät fordert Zugriff auf deine Kontakte und deine Anrufliste an. Weitere Informationen."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Möchtest du den Zugriff auf Kontakte und Anrufliste zulassen?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Ein nicht vertrauenswürdiges Bluetooth-Gerät, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, fordert Zugriff auf deine Kontakte und deine Anrufliste an. Dazu gehören auch Daten über ein- und ausgehende Anrufe.\n\nDu warst bisher noch nicht mit <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> verbunden."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Ein nicht vertrauenswürdiges Bluetooth-Gerät (<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>) möchte auf deine Kontakte und deine Anrufliste zugreifen. Dazu gehören auch Daten über ein- und ausgehende Anrufe.\n\nDu warst bisher noch nicht mit <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> verbunden."</string>
+    <!-- no translation found for category_name_brightness (8520372392029305084) -->
+    <skip />
+    <!-- no translation found for category_name_lock_display (7478785189102882266) -->
+    <skip />
+    <!-- no translation found for category_name_visibility (4485030512199246405) -->
+    <skip />
+    <!-- no translation found for category_name_color (937514550918977151) -->
+    <skip />
+    <!-- no translation found for category_name_others (2366006298768550310) -->
+    <skip />
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index fe8f6fc..5a3b043 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Ώρα λήξης"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Κατάσταση"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Ένταση"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Απενεργοποιημένος / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Δεν θα ενεργοποιείται ποτέ αυτόματα"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Θα ενεργοποιείται αυτόματα στις <xliff:g id="ID_1">%1$s</xliff:g>."</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Θα ενεργοποιείται αυτόματα με τη δύση του ηλίου"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Ενεργοποιημένη / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Δεν θα απενεργοποιείται ποτέ αυτόματα"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Θα απενεργοποιείται αυτόματα στις <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Θα απενεργοποιείται αυτόματα κατά την ανατολή του ηλίου"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Ενεργό από τη δύση ως το πρωι"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Ενεργοποίηση σε προσαρμ. ώρα"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Κατάσταση"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Ανενεργό / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Δεν θα ενεργοποιείται ποτέ αυτόματα"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Θα ενεργοποιείται αυτόματα με τη δύση του ηλίου"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Θα ενεργοποιείται αυτόματα στις <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Ενεργή / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Δεν θα απενεργοποιείται ποτέ αυτόματα"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Θα απενεργοποιείται αυτόματα κατά την ανατολή του ηλίου"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Θα απενεργοποιείται αυτόματα στις <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Αναγνώστες οθόνης"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Ήχος και κείμενο στην οθόνη"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Οθόνη"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Στοιχεία ελέγχου αλληλεπίδρασης"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Ληφθείσες εφαρμογές"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Σε πειραματικό στάδιο"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Διαγραφή χρήστη"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Διαγραφή"</string>
     <string name="user_guest" msgid="4545590092001460388">"Επισκέπτης"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Κατάργηση επισκέπτη"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Κατάργηση επισκέπτη;"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Διαγραφή δεδομένων επισκέπτη"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Λήξη περιόδου σύνδεσης επισκέπτη"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Λήξη περιόδου σύνδεσης επισκέπτη;"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Όλες οι εφαρμογές και τα δεδομένα αυτής της περιόδου σύνδεσης θα διαγραφούν."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Κατάργηση"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Λήξη περιόδου σύνδεσης"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Ενεργοποίηση τηλεφωνικών κλήσεων"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Ενεργοποίηση κλήσεων και SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Διαγραφή χρήστη"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Συζητήσεις χωρίς προτεραιότητα"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Οι συνομιλίες στις οποίες έχετε κάνει αλλαγές"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Πρόσφατες συνομιλίες"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Διαγραφή πρόσφατων"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Διαγραφή όλων των πρόσφατων"</string>
     <string name="clear" msgid="5092178335409471100">"Διαγραφή"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Εμφάνιση των συνομιλιών προτεραιότητας σε συννεφάκι"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Οι συνομιλίες προτεραιότητας εμφανίζονται στο επάνω μέρος του αναπτυσσόμενου πλαισίου σκίασης. Μπορείτε επίσης να τις ρυθμίσετε ώστε να εμφανίζονται σε συννεφάκι και να διακόψετε τη λειτουργία Μην ενοχλείτε."</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Σε σύνδεση σε πολλές συσκευές"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Λειτουργία επίδειξης διεπαφής χρήστη συστήματος"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Σκούρο θέμα"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Ενεργό / Απενεργ. προσωρινά λόγω της Εξοικονόμησης μπαταρίας"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Ενεργοποιήθηκε προσωρινά λόγω της Εξοικονόμησης μπαταρίας"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Θα γίνει επίσης εναλλαγή των υποστηριζόμενων εφαρμογών σε σκούρο θέμα"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Το κατάλαβα"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Προτιμήσεις"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Σύνδεση σε δημόσια δίκτυα"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"σύνδεση δικτύου, διαδίκτυο, ασύρματο, δεδομένα, wifi, wi-fi, wi fi, δίκτυο κινητής τηλεφωνίας, κινητό, εταιρεία κινητής τηλεφωνίας, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Προβολή ασφαλών δικτύων για πτήση"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Απενεργοποίηση λειτουργίας πτήσης"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Προβολή δικτύων λειτουργίας πτήσης"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Απενεργοποίηση λειτουργίας πτήσης"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Συνδέθηκε"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Δεν θα γίνει αυτόματη σύνδεση στο διαδίκτυο"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Δεν υπάρχουν άλλα διαθέσιμα δίκτυα"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Δεν υπάρχουν διαθέσιμα δίκτυα"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Μη διαθέσιμη επιλογή επειδή η λειτουργία ώρας ύπνου είναι ενεργή."</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Η επαναφορά σημασίας ειδοποίησης ολοκληρώθηκε."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Εφαρμογές"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Μια μη αξιόπιστη συσκευή θέλει να αποκτήσει πρόσβαση στα μηνύματά σας. Πατήστε για λεπτομέρειες."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Να επιτρέπεται η πρόσβαση σε μηνύματα;"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Μια μη αξιόπιστη συσκευή Bluetooth, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], θέλει να αποκτήσει πρόσβαση στα μηνύματά σας.\n\nΔεν έχετε συνδεθεί στη συσκευή [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] στο παρελθόν."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Μια μη αξιόπιστη συσκευή Bluetooth, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, θέλει να αποκτήσει πρόσβαση στα μηνύματά σας.\n\nΔεν έχετε συνδεθεί στη συσκευή <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> στο παρελθόν."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Μια μη αξιόπιστη συσκευή θέλει να αποκτήσει πρόσβαση στις επαφές και το αρχείο καταγραφής κλήσεων. Πατήστε για λεπτομέρειες."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Να επιτρέπεται η πρόσβαση στις επαφές και στο αρχείο καταγραφής κλήσεων;"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Μια μη αξιόπιστη συσκευή Bluetooth, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], θέλει να αποκτήσει πρόσβαση στις επαφές και το αρχείο καταγραφής κλήσεων. Αυτό περιλαμβάνει δεδομένα σχετικά με τις εισερχόμενες και τις εξερχόμενες κλήσεις.\n\nΔεν έχετε συνδεθεί στη συσκευή [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] στο παρελθόν."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Μια μη αξιόπιστη συσκευή Bluetooth, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, θέλει να αποκτήσει πρόσβαση στις επαφές και το αρχείο καταγραφής κλήσεων. Αυτό περιλαμβάνει δεδομένα σχετικά με τις εισερχόμενες και τις εξερχόμενες κλήσεις.\n\nΔεν έχετε συνδεθεί στη συσκευή <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> στο παρελθόν."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Φωτεινότητα"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Κλείδωμα οθόνης"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Ορατότητα"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Χρώμα"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Άλλα"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 3393b17..62db12f 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"End time"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Status"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intensity"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Off/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Will never turn on automatically"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Will turn on automatically at <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Will turn on automatically at sunset"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"On/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Will never turn off automatically"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Will turn off automatically at <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Will turn off automatically at sunrise"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Turns on from sunset to sunrise"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Turns on at custom time"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Status"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Off/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Will never turn on automatically"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Will turn on automatically at sunset"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Will turn on automatically at <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"On/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Will never turn off automatically"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Will turn off automatically at sunrise"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Will turn off automatically at <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Screen readers"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio and on-screen text"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Display"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Interaction controls"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Downloaded apps"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Experimental"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Delete user"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Delete"</string>
     <string name="user_guest" msgid="4545590092001460388">"Guest"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Remove guest"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Remove guest?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Clear guest data"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"End Guest session"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"End Guest session?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"All apps and data in this session will be deleted."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Remove"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"End session"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Turn on phone calls"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Turn on phone calls &amp; SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Delete user"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Non-priority conversations"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Conversations to which you’ve made changes"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Recent conversations"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Clear recents"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Clear all of the recent ones"</string>
     <string name="clear" msgid="5092178335409471100">"Clear"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Bubble priority conversations"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Priority conversations show at the top of the pull-down shade. You can also set them to bubble and interrupt Do Not Disturb."</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Connected to multiple devices"</string>
     <string name="demo_mode" msgid="6566167465451386728">"System UI demo mode"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Dark theme"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"On/Temporarily disabled due to Battery Saver"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Temporarily turned on due to Battery Saver"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Supported apps will also switch to dark theme"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"OK"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferences"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Connect to public networks"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, mobile operator, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"View aeroplane-safe networks"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Turn off aeroplane mode"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"View aeroplane mode networks"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Turn off aeroplane mode"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Connected"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet won\'t auto‑connect"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"No other networks available"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"No networks available"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Unavailable because bedtime mode is on"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Reset notification importance completed."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Apps"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Untrusted device wants to access your messages. Tap for details."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Allow access to messages?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"An untrusted Bluetooth device, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], wants to access your messages.\n\nYou haven’t connected to [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] before."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"An untrusted Bluetooth device, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, wants to access your messages.\n\nYou haven’t connected to <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> before."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Untrusted device wants to access your contacts and call log. Tap for details."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Allow access to contacts and call log?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"An untrusted Bluetooth device, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], wants to access your contacts and call log. This includes data about incoming and outgoing calls.\n\nYou haven’t connected to [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] before."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"An untrusted Bluetooth device, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, wants to access your contacts and call log. This includes data about incoming and outgoing calls.\n\nYou haven’t connected to <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> before."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Brightness"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Lock display"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Visibility"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Colour"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Others"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 8f1ea0a..4c1e24c 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"End time"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Status"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intensity"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Off/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Will never turn on automatically"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Will turn on automatically at <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Will turn on automatically at sunset"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"On/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Will never turn off automatically"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Will turn off automatically at <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Will turn off automatically at sunrise"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Turns on from sunset to sunrise"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Turns on at custom time"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Status"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Off/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Will never turn on automatically"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Will turn on automatically at sunset"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Will turn on automatically at <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"On/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Will never turn off automatically"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Will turn off automatically at sunrise"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Will turn off automatically at <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Screen readers"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio and on-screen text"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Display"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Interaction controls"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Downloaded apps"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Experimental"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Delete user"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Delete"</string>
     <string name="user_guest" msgid="4545590092001460388">"Guest"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Remove guest"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Remove guest?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Clear guest data"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"End Guest session"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"End Guest session?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"All apps and data in this session will be deleted."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Remove"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"End session"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Turn on phone calls"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Turn on phone calls &amp; SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Delete user"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Non-priority conversations"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Conversations to which you’ve made changes"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Recent conversations"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Clear recents"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Clear all of the recent ones"</string>
     <string name="clear" msgid="5092178335409471100">"Clear"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Bubble priority conversations"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Priority conversations show at the top of the pull-down shade. You can also set them to bubble and interrupt Do Not Disturb."</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Connected to multiple devices"</string>
     <string name="demo_mode" msgid="6566167465451386728">"System UI demo mode"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Dark theme"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"On/Temporarily disabled due to Battery Saver"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Temporarily turned on due to Battery Saver"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Supported apps will also switch to dark theme"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"OK"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferences"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Connect to public networks"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, mobile operator, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"View aeroplane-safe networks"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Turn off aeroplane mode"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"View aeroplane mode networks"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Turn off aeroplane mode"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Connected"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet won\'t auto‑connect"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"No other networks available"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"No networks available"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Unavailable because bedtime mode is on"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Reset notification importance completed."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Apps"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Untrusted device wants to access your messages. Tap for details."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Allow access to messages?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"An untrusted Bluetooth device, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], wants to access your messages.\n\nYou haven’t connected to [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] before."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"An untrusted Bluetooth device, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, wants to access your messages.\n\nYou haven’t connected to <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> before."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Untrusted device wants to access your contacts and call log. Tap for details."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Allow access to contacts and call log?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"An untrusted Bluetooth device, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], wants to access your contacts and call log. This includes data about incoming and outgoing calls.\n\nYou haven’t connected to [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] before."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"An untrusted Bluetooth device, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, wants to access your contacts and call log. This includes data about incoming and outgoing calls.\n\nYou haven’t connected to <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> before."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Brightness"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Lock display"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Visibility"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Colour"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Others"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index fa94b82..4b562da 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"End time"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Status"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intensity"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Off/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Will never turn on automatically"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Will turn on automatically at <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Will turn on automatically at sunset"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"On/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Will never turn off automatically"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Will turn off automatically at <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Will turn off automatically at sunrise"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Turns on from sunset to sunrise"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Turns on at custom time"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Status"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Off/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Will never turn on automatically"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Will turn on automatically at sunset"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Will turn on automatically at <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"On/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Will never turn off automatically"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Will turn off automatically at sunrise"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Will turn off automatically at <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Screen readers"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio and on-screen text"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Display"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Interaction controls"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Downloaded apps"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Experimental"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Delete user"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Delete"</string>
     <string name="user_guest" msgid="4545590092001460388">"Guest"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Remove guest"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Remove guest?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Clear guest data"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"End Guest session"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"End Guest session?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"All apps and data in this session will be deleted."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Remove"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"End session"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Turn on phone calls"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Turn on phone calls &amp; SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Delete user"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Non-priority conversations"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Conversations to which you’ve made changes"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Recent conversations"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Clear recents"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Clear all of the recent ones"</string>
     <string name="clear" msgid="5092178335409471100">"Clear"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Bubble priority conversations"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Priority conversations show at the top of the pull-down shade. You can also set them to bubble and interrupt Do Not Disturb."</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Connected to multiple devices"</string>
     <string name="demo_mode" msgid="6566167465451386728">"System UI demo mode"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Dark theme"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"On/Temporarily disabled due to Battery Saver"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Temporarily turned on due to Battery Saver"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Supported apps will also switch to dark theme"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"OK"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferences"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Connect to public networks"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, mobile operator, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"View aeroplane-safe networks"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Turn off aeroplane mode"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"View aeroplane mode networks"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Turn off aeroplane mode"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Connected"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet won\'t auto‑connect"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"No other networks available"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"No networks available"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Unavailable because bedtime mode is on"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Reset notification importance completed."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Apps"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Untrusted device wants to access your messages. Tap for details."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Allow access to messages?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"An untrusted Bluetooth device, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], wants to access your messages.\n\nYou haven’t connected to [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] before."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"An untrusted Bluetooth device, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, wants to access your messages.\n\nYou haven’t connected to <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> before."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Untrusted device wants to access your contacts and call log. Tap for details."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Allow access to contacts and call log?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"An untrusted Bluetooth device, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], wants to access your contacts and call log. This includes data about incoming and outgoing calls.\n\nYou haven’t connected to [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] before."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"An untrusted Bluetooth device, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, wants to access your contacts and call log. This includes data about incoming and outgoing calls.\n\nYou haven’t connected to <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> before."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Brightness"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Lock display"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Visibility"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Colour"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Others"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 66ce5da..4f8e3f7 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"End time"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Status"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intensity"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Off/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Will never turn on automatically"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Will turn on automatically at <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Will turn on automatically at sunset"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"On/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Will never turn off automatically"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Will turn off automatically at <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Will turn off automatically at sunrise"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Turns on from sunset to sunrise"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Turns on at custom time"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Status"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Off/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Will never turn on automatically"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Will turn on automatically at sunset"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Will turn on automatically at <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"On/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Will never turn off automatically"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Will turn off automatically at sunrise"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Will turn off automatically at <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Screen readers"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio and on-screen text"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Display"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Interaction controls"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Downloaded apps"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Experimental"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Delete user"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Delete"</string>
     <string name="user_guest" msgid="4545590092001460388">"Guest"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Remove guest"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Remove guest?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Clear guest data"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"End Guest session"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"End Guest session?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"All apps and data in this session will be deleted."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Remove"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"End session"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Turn on phone calls"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Turn on phone calls &amp; SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Delete user"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Non-priority conversations"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Conversations to which you’ve made changes"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Recent conversations"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Clear recents"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Clear all of the recent ones"</string>
     <string name="clear" msgid="5092178335409471100">"Clear"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Bubble priority conversations"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Priority conversations show at the top of the pull-down shade. You can also set them to bubble and interrupt Do Not Disturb."</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Connected to multiple devices"</string>
     <string name="demo_mode" msgid="6566167465451386728">"System UI demo mode"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Dark theme"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"On/Temporarily disabled due to Battery Saver"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Temporarily turned on due to Battery Saver"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Supported apps will also switch to dark theme"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"OK"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferences"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Connect to public networks"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, mobile operator, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"View aeroplane-safe networks"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Turn off aeroplane mode"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"View aeroplane mode networks"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Turn off aeroplane mode"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Connected"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet won\'t auto‑connect"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"No other networks available"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"No networks available"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Unavailable because bedtime mode is on"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Reset notification importance completed."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Apps"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Untrusted device wants to access your messages. Tap for details."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Allow access to messages?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"An untrusted Bluetooth device, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], wants to access your messages.\n\nYou haven’t connected to [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] before."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"An untrusted Bluetooth device, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, wants to access your messages.\n\nYou haven’t connected to <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> before."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Untrusted device wants to access your contacts and call log. Tap for details."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Allow access to contacts and call log?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"An untrusted Bluetooth device, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], wants to access your contacts and call log. This includes data about incoming and outgoing calls.\n\nYou haven’t connected to [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] before."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"An untrusted Bluetooth device, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, wants to access your contacts and call log. This includes data about incoming and outgoing calls.\n\nYou haven’t connected to <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> before."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Brightness"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Lock display"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Visibility"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Colour"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Others"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index ca37379..b051d83 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‎‎‎‎‏‏‎‏‎‎‎‏‏‏‎‎‎‎‎‏‎‏‏‎‎‎‏‏‏‏‎‎‏‎‎‎‏‎‎‏‎‏‏‏‏‎‎‎‏‎‏‏‏‏‎End time‎‏‎‎‏‎"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎‏‎‏‎‏‎‎‏‎‎‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‏‏‏‎‎‎Status‎‏‎‎‏‎"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‏‏‎‎‏‎‏‏‎‎‎‏‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎‏‎‏‏‎‏‎‎‏‏‏‎‎‏‎‏‎‏‏‎‏‏‏‎‎‏‏‏‎Intensity‎‏‎‎‏‎"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‎‎‏‎‏‏‎‏‎‎‎‎‎‏‏‏‎‏‏‏‎‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‎‏‏‎‏‎‎‏‎‎‎‏‏‏‎‎‏‎Off / ‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‎‏‏‎‏‎‎‎‏‎‏‎‎‏‎‏‏‏‏‎‎‏‏‏‏‎‎Will never turn on automatically‎‏‎‎‏‎"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‎‏‎‏‏‏‏‏‏‎‎‎‎‏‏‏‏‏‎‎‏‏‏‏‏‏‎‎‎‎‎‏‎‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‏‏‎Will turn on automatically at ‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‎‏‎‏‏‎‏‏‎‎‎‎‎‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‎‏‎‏‎‏‎‎‏‎‎‎‏‎‎‎‎‏‎‎Will turn on automatically at sunset‎‏‎‎‏‎"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‏‏‎‎‏‏‎‎‎‏‎‏‎‎‏‎‎‎‏‎‏‏‎‏‎On / ‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‎‎‎‏‏‎‏‎‎‎‎‏‎‏‎‎‏‏‏‎‏‏‎‎‏‎‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‎‏‎‎‎‎‏‏‎‎Will never turn off automatically‎‏‎‎‏‎"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‎‎‏‏‎‎‎‏‏‏‎‎‏‎‎‏‎‏‎‎‏‎‏‎‏‎‏‏‎‎‎‎‏‎‏‎‎‎‏‎‏‎‎‏‏‎‎‏‏‎‏‏‎‏‏‎Will turn off automatically at ‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‎‎‎‎‎‏‏‏‏‎‎‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‏‏‎‏‎‏‎‎‏‎Will turn off automatically at sunrise‎‏‎‎‏‎"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‏‎‎‏‎‎‏‏‎‎‏‎‎‏‏‏‏‎‏‏‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‎‎‎‎‏‎‏‎‏‏‎‎‎‏‏‏‏‎Turns on from sunset to sunrise‎‏‎‎‏‎"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‏‎‏‏‎‎‎‏‎‏‏‏‎‏‎‎‏‏‎‎‎‏‎‎‎‎‎‏‏‏‏‎‏‎‏‏‏‎‏‏‎‏‎‎Turns on at custom time‎‏‎‎‏‎"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‎‎‏‎‎‏‎‏‎‏‏‏‏‎‏‎‎‏‎‎‏‏‏‎‎‏‎‎‎‏‏‎‏‎‎‏‎‎‎‎‏‏‎‎‏‏‏‏‏‏‎‎‏‎Status‎‏‎‎‏‎"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‏‎‏‏‎‎‏‏‏‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‏‎‎‏‏‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‏‏‎Off / ‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‎‎‎‏‎‎‎‏‏‎‏‏‏‎‎‏‏‎‎‎‎‏‎‎‎‏‏‏‏‎‏‏‏‎‏‏‎‎‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‎Will never turn on automatically‎‏‎‎‏‎"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‏‎‏‎‎‎‏‎‎‏‏‏‎‏‎‏‎‎‏‏‎‏‎‏‏‎‏‎‏‏‏‏‎‎‏‏‏‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‎Will turn on automatically at sunset‎‏‎‎‏‎"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‎‏‎‏‏‎‏‏‎‎‏‏‏‏‎‎‏‏‏‎‏‎‎‏‏‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‎‎Will turn on automatically at ‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‎‎‎‏‎‏‏‎‎‏‎‎‎‎‏‏‎‏‎‏‏‎‏‏‏‏‏‎‎‏‏‎‏‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‎‎On / ‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎‏‎‏‏‎‏‎‏‎‎‎‎‏‎‎‎‏‎‎‎‎‎‎‎‏‎Will never turn off automatically‎‏‎‎‏‎"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‏‎‎‎‏‏‎‎‎‏‏‏‎‎‎‏‎‎‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‏‏‎‎‎‏‏‏‎‎‏‎‏‎‏‏‏‏‎‎‎Will turn off automatically at sunrise‎‏‎‎‏‎"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‎‎‏‎‎‎‏‎‏‏‏‏‎‏‎‏‎‎‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎‎‏‎‎‎‏‏‎‎‏‎‏‎‎‏‎‎‎‎‎‎‎‎Will turn off automatically at ‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
@@ -2136,6 +2132,7 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‎‎‏‎‏‏‏‎‏‎‎‎‏‎‎‏‏‏‎‏‎‏‏‎‏‏‎‎‎‎‎‎‎‎‏‎Screen readers‎‏‎‎‏‎"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‎‏‎‎‏‎‎‎‎‏‎‏‏‎‎‎‎‎‏‏‎‏‎‎‏‏‏‎‎‏‎‏‏‏‎‎‏‏‏‎‎‎‎‎‎‎‎‏‎‏‎‎‏‎‎Audio &amp; on-screen text‎‏‎‎‏‎"</string>
     <string name="display_category_title" msgid="6638191682294461408">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‏‎‏‎‏‎‎‎‎‏‎‏‏‎‎‎‎‏‏‏‎‏‎‎‏‏‎‎‏‏‏‏‏‎‎‎‎‎‎Display‎‏‎‎‏‎"</string>
+    <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‏‏‎‏‏‏‏‎‎‏‎‎‏‎‎‏‎‎‏‏‎‎‎‏‏‎‏‏‎‎‎‏‎Text and display‎‏‎‎‏‎"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‏‎‎‎‎‎‏‎‎‏‏‏‎‎‏‏‏‎‎‎‎‎‎‏‏‎‏‏‏‎‏‎‎‎‎‏‎‎‎Interaction controls‎‏‎‎‏‎"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‎‏‎‎‎‎‏‎‏‎‎‏‎‎‎‏‎‏‎‎‏‎‎‏‏‎‎‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‎‏‎‏‏‎‏‏‏‎‎‏‏‎Downloaded apps‎‏‎‎‏‎"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‏‏‏‏‎‎‏‏‎‎‎‏‏‎‎‏‏‎‎‏‎‎‏‎‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‎‏‏‎‎‏‎‏‏‏‎‏‏‎‎‎‎Experimental‎‏‎‎‏‎"</string>
@@ -3075,10 +3072,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‎‎‎‎‏‏‎‎‏‏‎‎‏‏‏‏‏‎‎‏‎‎‏‎‏‏‎‎‏‏‎‏‎‎‏‏‎Delete user‎‏‎‎‏‎"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‎‏‏‎‎‏‏‎‏‎‏‎‎‏‎‏‎‏‏‎‏‏‎‎‎‏‎‏‎‏‏‎‎‎‏‎‎‏‎‏‎‏‏‎‎‎‎‎‏‎‏‏‏‎‏‎Delete‎‏‎‎‏‎"</string>
     <string name="user_guest" msgid="4545590092001460388">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‎‏‎‏‎‏‎‎‏‎‏‏‏‎‎‎‎‏‏‎‏‎‏‏‏‎‏‎‎‎‎‏‎‎‏‎‎‎‎‏‎‎‎‎‎‎‏‎‏‎‎‏‎‎‎Guest‎‏‎‎‏‎"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‏‎‎‎‏‏‎‏‏‎‏‏‏‎‎‏‏‏‎‏‏‎‏‎‏‎‎‏‎‎‎‏‏‏‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎Remove guest‎‏‎‎‏‎"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‏‎‏‎‏‎‎‏‎‎‏‏‏‎‎‎‎‏‎‎‎‎‏‎‎‎‏‎‏‏‎‎‏‎‏‏‎‎‎‎‎‏‎‏‎‏‏‎‎‎‏‎‎‏‎‎Remove guest?‎‏‎‎‏‎"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎‎‎‎‎‏‏‎‏‏‎‎‎‎‎‎‎‏‎‏‏‏‏‎‏‎‏‎‎‎‎‎‎‏‎‏‎‎‎‎‏‏‏‎‎‏‏‎‎‎‎‏‎‎‎Clear guest data‎‏‎‎‏‎"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‎‏‎‎‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎‎‏‎‎‏‏‏‏‏‎‏‎‏‎‎‏‏‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‎End guest session‎‏‎‎‏‎"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‎‏‎‏‎‎‏‏‎‎‏‏‎‏‏‏‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎‏‎‏‏‎‎‏‎End guest session?‎‏‎‎‏‎"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‏‏‎‏‏‎‏‏‎‏‏‎‏‎‏‎‎‎‏‎‏‏‎‏‏‏‎‎‏‏‏‎‏‏‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎All apps and data in this session will be deleted.‎‏‎‎‏‎"</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‏‎‏‎‏‏‎‎‏‏‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‏‎‎‏‎‏‎‏‎‏‏‏‎‎‏‎‏‏‏‏‏‏‎‏‎Remove‎‏‎‎‏‎"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‎‏‏‏‏‎‎‎‏‏‎‏‎‏‎‏‎‎‎‏‎‏‎‏‏‏‎‏‎‎‎‏‏‎‏‏‎‎‎‎‏‎‏‏‏‎‏‎‏‏‏‏‎End session‎‏‎‎‏‎"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‎‏‎‏‏‎‏‎‎‎‎‎‏‏‎‏‎‏‏‏‏‎‎‏‎‏‏‎‎‏‏‏‏‏‎‏‎‏‏‏‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎Turn on phone calls‎‏‎‎‏‎"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‏‏‎‎‎‎‎‏‎‏‎‏‎‏‎‎‎‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‎‎‎‎‏‏‎‎‎‏‏‎‎‎Turn on phone calls &amp; SMS‎‏‎‎‏‎"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‎‏‎‎‎‏‏‎‏‎‎‏‏‏‏‎‏‎‏‏‏‏‎‏‎‏‎‎‎‎‏‏‎‏‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‏‎Delete user‎‏‎‎‏‎"</string>
@@ -3591,7 +3589,7 @@
     <string name="other_conversations" msgid="551178916855139870">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‎‏‏‏‎‎‏‎‎‏‏‎‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‏‏‏‎‎‏‏‏‎‎‎‎‏‏‏‏‎‎Non-priority conversations‎‏‎‎‏‎"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‎‎‏‎‏‏‏‎‏‎‏‎‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‎‏‎‎‎‏‏‏‎‎‏‎‎‎‎‏‏‎‎‎‏‎Conversations you’ve made changes to‎‏‎‎‏‎"</string>
     <string name="recent_conversations" msgid="471678228756995274">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‏‏‎‏‏‎‎‏‏‎‎‏‏‎‎‏‎‏‎‏‏‎‎‎‏‎‎‏‏‏‎‎‏‏‎‎‏‎‏‎‎Recent conversations‎‏‎‎‏‎"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‏‏‏‎‎‎‏‎‏‎‏‎‎‎‏‏‎‏‎‏‎‎‏‎‎‎‎‎‏‏‎‎‎‏‎‎‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎Clear recents‎‏‎‎‏‎"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‎‎‏‎‏‏‏‎‎‏‏‏‎‎‎‏‎‎‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‎‎Clear all of the recent ones‎‏‎‎‏‎"</string>
     <string name="clear" msgid="5092178335409471100">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‎‏‎‏‏‎‎‎‎‏‏‎‏‎‎‏‏‎‏‏‏‎‏‏‎‏‏‏‏‎‎‎‎‎‏‎‏‎‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‎Clear‎‏‎‎‏‎"</string>
     <string name="important_bubble" msgid="7911698275408390846">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‎‏‏‎‏‏‏‏‎‎‏‎‎‏‏‎‏‎‏‎‏‎‏‎‏‏‏‏‏‎‎Bubble priority conversations‎‏‎‎‏‎"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‎‎‏‏‎‏‎‏‏‏‏‏‏‎‎‎‎‎‎‎‎‏‎‎‏‎‎‎‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‏‏‎‎‏‎‎‏‎‏‎‎‎Priority conversations show at the top of the pull-down shade. You can also set them to bubble and interrupt Do Not Disturb.‎‏‎‎‏‎"</string>
@@ -4424,7 +4422,7 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‏‎‎‎‏‎‎‎‏‎‎‎‎‎‎‎‎‎‎‏‎‏‎‏‎‎‏‏‎‏‎‎‎‎‎‏‎‏‏‎‎‎‏‎‎‎Connected to multiple devices‎‏‎‎‏‎"</string>
     <string name="demo_mode" msgid="6566167465451386728">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‏‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‎‎‏‎‏‎‏‎‏‎‎‎‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‏‏‎‏‏‎‏‎‎‎‎System UI demo mode‎‏‎‎‏‎"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‏‏‏‎‏‏‎‏‏‎‏‏‎‏‏‎‏‏‎‎‎‏‏‎‎‎‏‏‏‎‎‎‎‎‎‏‏‎‎‎‎‏‎‎‎‏‎‏‏‎‏‎‎‎‏‎Dark theme‎‏‎‎‏‎"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‏‎‎‎‎‏‏‏‏‎‎‎‏‎‎‏‎‏‏‎‏‏‎‎‏‎‏‎‏‎‏‎‎‏‎‏‎‏‎‏‎‎‏‎‏‎‏‎‏‎‏‎‎‎‎On / Temporarily disabled due to Battery Saver‎‏‎‎‏‎"</string>
+    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="4554134480159161533">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‏‏‏‎‎‏‎‎‏‏‎‏‎‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎Temporarily disabled due to Battery Saver‎‏‎‎‏‎"</string>
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‎‏‏‎‏‏‎‎‏‎‎‎‎‏‎‎‏‎‎‎‏‏‎‎‏‏‎‏‏‏‏‎‎‏‏‎‏‎‏‎‎‎‎‏‏‎‏‎‎‏‏‎‎Temporarily turned on due to Battery Saver‎‏‎‎‏‎"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‏‎‏‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‎‎‎‏‏‏‎‎‎‎‏‏‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎‎‏‏‏‎‎Supported apps will also switch to dark theme‎‏‎‎‏‎"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‏‏‏‏‎‎‏‏‎‏‏‏‎‏‏‏‎‎‏‎‎‏‏‏‏‎‎‏‎‏‎‏‎‏‎‎‎‎‏‏‎‏‏‎‎‎‎‏‎‏‎‏‏‎‏‎Got it‎‏‎‎‏‎"</string>
@@ -5063,15 +5061,26 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‎‏‏‏‎‎‏‏‎‎‎‎‏‎‏‎‎‏‏‎‏‎‎‎‏‏‎‏‏‏‎‎‎‏‏‏‎‎‎‏‎‏‎‎‎‏‎‎‎‏‏‏‏‎Preferences‎‏‎‎‏‎"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‎‎‎‎‏‎‏‎‎‎‏‏‎‎‏‏‏‏‎‏‏‏‏‎‎‎‏‏‏‎‏‎‎‎‏‏‏‎‎‎‏‏‎‏‏‏‏‎‎‏‏‎‎‏‎Connect to public networks‎‏‎‎‏‎"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‏‎‏‏‎‎‏‏‎‏‎‏‎‏‏‏‎‏‏‏‏‏‎‎‏‎‏‎‎‎‎‎‏‏‎‎network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, cell carrier, 4g, 3g, 2g, lte‎‏‎‎‏‎"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‏‎‎‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‏‎‏‎‎‎‎‏‏‏‎‏‎‏‎‏‏‎‎‏‎‎View airplane-safe networks‎‏‎‎‏‎"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‎‎‎‎‎‏‏‎‏‏‏‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‎‏‏‏‏‎‏‏‏‎Turn off Airplane Mode‎‏‎‎‏‎"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‏‎‎‎‏‎‎‎‏‎‏‎‎‎‏‏‏‏‎‎‎‏‏‏‎‎‏‎‏‎‏‎‎View airplane mode networks‎‏‎‎‏‎"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‏‏‏‎‏‎‏‏‎‏‏‏‎‏‏‎‎‎‎‏‎‏‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‏‏‎‎‎‎‏‎‏‏‎Turn off airplane mode‎‏‎‎‏‎"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‏‏‎‎‎‏‎‏‎‏‎‏‎‎‏‏‎‎‏‎‎‏‎‏‏‏‏‎‏‎‎‎‎‎‎‎‎‏‏‏‏‎‎‏‎‏‎‎‎‏‏‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="STATE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ / ‎‏‎‎‏‏‎<xliff:g id="NETWORKMODE">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‎‎‏‏‏‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‏‎‏‏‎‎‎‎‏‎‏‎‏‏‎‏‎‏‎‏‏‎‎‏‎‎‏‎‏‏‏‎‎‎‎‎Connected‎‏‎‎‏‎"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‏‏‏‎‏‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‏‏‎‏‎‎‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‎‏‎‏‎‎‏‏‎Internet won\'t auto‑connect‎‏‎‎‏‎"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‏‎‎‏‎‎‏‎‏‎‏‏‎‏‎‎‏‏‎‎‏‏‎‎‏‎‏‏‎‎‏‎‏‎‎‎‎‎‏‎‏‏‏‏‏‏‎‏‎No other networks available‎‏‎‎‏‎"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‎‏‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‎‎‎No networks available‎‏‎‎‏‎"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‎‎‏‎‎‎‏‎‎‏‎‏‎‎‎‎‏‏‎‏‎‏‏‏‎‎‏‎‎‎‎‎‎‎‎‎‎‏‎‎‎‏‏‎‏‎‏‎‏‏‎‎‎‎Unavailable because bedtime mode is on‎‏‎‎‏‎"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎‎‏‏‎‏‎‎‎‏‏‏‏‎‏‎‏‏‏‎‏‎‎‏‎‎‏‏‏‏‏‎‎‎‎‎‎‏‏‎‏‎‏‎Reset notification importance completed.‎‏‎‎‏‎"</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‎‎‎‎‏‎‎‏‏‎‏‎‏‎‏‏‎‎‎‏‎‎‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‏‎‏‏‎‎‏‎‎‏‏‎‏‎‏‎‎Apps‎‏‎‎‏‎"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‏‎‎‎‎‏‏‎‎‏‎‎‏‏‏‎‎‎‏‏‏‏‎‏‏‎‏‏‏‏‎‎‏‎‏‎‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎Untrusted device wants to access your messages. Tap for details.‎‏‎‎‏‎"</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‎‏‎‏‏‏‏‎‎‎‏‏‏‎‎‏‎‏‏‏‎‏‎‎‏‎‏‎‏‏‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‎Allow access to messages?‎‏‎‎‏‎"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‎‏‎‏‎‎‎‏‎‎‏‎‏‎‏‏‏‏‏‎‎‏‎‎‏‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‏‏‎‏‎‎‎‎‏‏‏‎An untrusted Bluetooth device, [‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>‎‏‎‎‏‏‏‎], wants to access your messages.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎You haven’t connected to [‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>‎‏‎‎‏‏‏‎] before.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‎‎‏‎‏‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‏‎‏‏‎‏‎‎‏‏‎‎‎‏‎‎‏‎‏‎‏‏‎An untrusted Bluetooth device, ‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>‎‏‎‎‏‏‏‎, wants to access your messages.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎You haven’t connected to ‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>‎‏‎‎‏‏‏‎ before.‎‏‎‎‏‎"</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‎‏‏‎‏‏‏‎‎‏‏‎‎‎‏‏‎‏‏‏‎‏‏‎‏‎‎‏‎‏‎‏‎‎‏‎‏‎‏‏‎‎‎‏‏‏‎‏‏‏‏‏‎Untrusted device wants to access your contacts and call log. Tap for details.‎‏‎‎‏‎"</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‎‎‎‎‎‎‎‏‏‎‎‏‎‎‏‎‎‏‏‎‏‎‎‏‏‎‎‏‏‏‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‏‎Allow access to contacts and call log?‎‏‎‎‏‎"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‎‎‎‎‏‏‏‎‏‏‎‏‏‎‏‏‎‎‏‎‎‎‎‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‏‎‏‏‎‏‏‎An untrusted Bluetooth device, [‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>‎‏‎‎‏‏‏‎], wants to access your contacts and call log. This includes data about incoming and outgoing calls.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎You haven’t connected to [‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>‎‏‎‎‏‏‏‎] before.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‏‎‎‏‏‎‏‎‏‏‏‎‎‎‎‏‏‎‏‎‎‎‏‏‎‎‏‎‏‏‏‎‎‎‎‎‎‎‏‏‎‎‏‏‏‎‎‏‎‎‎‏‎‎‎An untrusted Bluetooth device, ‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>‎‏‎‎‏‏‏‎, wants to access your contacts and call log. This includes data about incoming and outgoing calls.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎You haven’t connected to ‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>‎‏‎‎‏‏‏‎ before.‎‏‎‎‏‎"</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‎‎‏‏‏‎‎‎‏‏‎‎‎‏‏‎‎‎‎‏‏‎‏‎‎‏‏‏‏‎‎‏‏‏‎‏‏‏‎‎‎‏‏‏‏‏‏‎‎‎Brightness‎‏‎‎‏‎"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‏‎‎‏‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‏‎‏‎‏‎‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‎‏‏‏‎‏‏‎‏‎‎Lock Display‎‏‎‎‏‎"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‎‏‏‏‏‏‎‎‎‎‎‎‏‏‏‎‏‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‎‏‎‏‎‎‎‏‎‎‏‎‎‎‏‎‏‎Visibility‎‏‎‎‏‎"</string>
+    <string name="category_name_color" msgid="937514550918977151">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‎‎‎‎‎‏‎‏‎‏‏‏‎‎‎‏‎‎‎‎‏‎‎‎‏‎‏‎‎‏‏‎‏‎‎‏‎‎‏‎‎‎‏‎‏‏‎‎‏‏‏‏‏‏‏‎Color‎‏‎‎‏‎"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‏‎‏‎‏‎‏‏‎‏‏‏‏‏‎‎‎‏‏‎‎‎‏‎‏‏‎‏‏‏‎‎‏‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‎‎‏‏‎‎Others‎‏‎‎‏‎"</string>
+    <string name="category_name_general" msgid="7737273712848115886">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‎‎‎‎‏‎‏‎‎‎‏‎‏‏‏‎‎‏‎‏‎‏‏‎‎‎‎‎‏‎‎‎‏‏‏‏‎‎‏‏‎‎‎‏‎‏‎‏‏‏‎‎General‎‏‎‎‏‎"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 5ae9844..3c16d01 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -721,7 +721,7 @@
     <string name="bluetooth_preference_paired_dialog_internet_option" msgid="4337953030661626289">"Conexión a Internet"</string>
     <string name="bluetooth_preference_paired_dialog_keyboard_option" msgid="8247634441638919886">"Teclado"</string>
     <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="8194423860397844579">"Contactos e historial de llamadas"</string>
-    <string name="bluetooth_pairing_dialog_title" msgid="6106058683134173178">"¿Sincronizar con este dispositivo?"</string>
+    <string name="bluetooth_pairing_dialog_title" msgid="6106058683134173178">"¿Vincular con este dispositivo?"</string>
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="5472835166206721325">"¿Compartir libreta telefónica?"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="7516277926581535299">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> quiere acceder a tus contactos y al historial de llamadas."</string>
     <string name="bluetooth_pairing_dialog_paring_request" msgid="1545098121090892788">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> quiere sincronizarse con Bluetooth. Al conectarse, podrá acceder a contactos e hist. de llamadas."</string>
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Hora de finalización"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Estado"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intensidad"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Desactivado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Nunca se activará automáticamente"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Se activará automáticamente a las <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Se activará automáticamente al atardecer"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Activado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Nunca se desactivará automáticamente"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Se desactivará automáticamente a las <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Se desactivará automáticamente al amanecer"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Activar de atardecer a amanecer"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Activar a una hora personalizada"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Estado"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Desactivado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Nunca se activará automáticamente"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Se activará automáticamente al atardecer"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Se activará automáticamente a la(s) <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Activado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Nunca se desactivará automáticamente"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Se desactivará automáticamente al amanecer"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Se desactivará automáticamente a la(s) <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -1606,13 +1602,13 @@
     <string name="restore_default_apn" msgid="6596048535642130689">"Restaurando la configuración APN predeterminada"</string>
     <string name="menu_restore" msgid="4310539620115151551">"Restablecer valores predeterminados"</string>
     <string name="restore_default_apn_completed" msgid="5167505087078340256">"Se restableció la configuración predeterminada de APN."</string>
-    <string name="reset_dashboard_title" msgid="7423200250697886918">"Opciones de restablecimiento"</string>
+    <string name="reset_dashboard_title" msgid="7423200250697886918">"Restablecimiento"</string>
     <string name="reset_dashboard_summary" msgid="4390780188264852956">"Se pueden restablecer las redes, las apps y los dispositivos"</string>
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Se pueden restablecer las apps"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Restablecer configuración de Wi-Fi, datos móviles y Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Se restablecerán las opciones de configuración de todas las redes, lo que incluye:\n\n"<li>"Wi‑Fi"</li>\n<li>"Datos móviles"</li>\n<li>"Bluetooth"</li></string>
     <string name="erase_euicc_data_button" msgid="728078969563311737">"Borrar"</string>
-    <string name="reset_esim_title" msgid="6152167073280852849">"Borrar tarjeta SIM descargada"</string>
+    <string name="reset_esim_title" msgid="6152167073280852849">"Borrar tarjetas SIM descargadas"</string>
     <string name="reset_esim_desc" msgid="3662444090563399131">"Esta acción no cancelará ningún plan de servicio móvil. Para descargar tarjetas SIM de reemplazo, comunícate con tu proveedor."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Restablecer configuración"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"¿Quieres restablecer toda la configuración de red? No podrás deshacer esta acción."</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Lectores de pantalla"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio y texto en pantalla"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Pantalla"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Controles de interacción"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Apps descargadas"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Experimental"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Borrar usuario"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Borrar"</string>
     <string name="user_guest" msgid="4545590092001460388">"Invitado"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Eliminar invitado"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"¿Eliminar invitado?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Borrar datos de invitado"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Finalizar sesión de invitado"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"¿Quieres finalizar la sesión de invitado?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Se eliminarán las aplicaciones y los datos de esta sesión."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Eliminar"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Finalizar sesión"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Activar llamadas de teléfono"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Activar llamadas telefónicas y SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Borrar usuario"</string>
@@ -3094,7 +3093,7 @@
     <string name="nfc_payment_settings_title" msgid="2043139180030485500">"Pagos sin contacto"</string>
     <string name="nfc_payment_how_it_works" msgid="3658253265242662010">"Cómo funciona"</string>
     <string name="nfc_payment_no_apps" msgid="6840001883471438798">"Paga en las tiendas con tu teléfono"</string>
-    <string name="nfc_payment_default" msgid="3769788268378614608">"App de pago predeterminada"</string>
+    <string name="nfc_payment_default" msgid="3769788268378614608">"App de pagos predeterminada"</string>
     <string name="nfc_payment_default_not_set" msgid="6471905683119084622">"Sin establecer"</string>
     <string name="nfc_payment_app_and_desc" msgid="2607417639227030398">"<xliff:g id="APP">%1$s</xliff:g>: <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="nfc_payment_use_default" msgid="788899906312142803">"Utilizar la aplicación predeterminada"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Conversaciones no prioritarias"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Conversaciones que modificaste"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Conversaciones recientes"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Borrar recientes"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Borrar recientes"</string>
     <string name="clear" msgid="5092178335409471100">"Borrar"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Guardar conversaciones prioritarias en burbujas"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Las conversaciones prioritarias se muestran en la parte superior del panel desplegable. También puedes configurarlas para que aparezcan como burbujas y que suspendan la función No interrumpir."</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Conectado a varios dispositivos"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Modo demostración de la IU del sistema"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Tema oscuro"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Activado: Inhabilitado temporalmente por Ahorro de batería"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Activado temporalmente por el Ahorro de batería"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Las apps compatibles también se cambiarán a tema oscuro"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Entendido"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferencias"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Conectarse a redes públicas"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"conexión de red, internet, inalámbrico, datos, wifi, wi-fi, wi fi, datos móviles, móvil, proveedor de telefonía, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Ver redes seguras para aviones"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Desactivar el Modo de avión"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Ver redes para modo avión"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Desactivar el modo de avión"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Conexión establecida"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"No se conectará automáticamente a Internet"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"No hay otras redes disponibles"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"No hay redes disponibles"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"No disponible cuando el modo hora de dormir está activado"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Se restableció la prioridad de notificaciones."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Apps"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Un dispositivo que no es de confianza quiere acceder a tus mensajes. Presiona para ver más detalles"</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"¿Quieres permitir el acceso a los mensajes?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Un dispositivo Bluetooth que no es de confianza, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], quiere acceder a tus mensajes.\n\nNo te conectaste a [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] antes."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Un dispositivo Bluetooth que no es de confianza, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, quiere acceder a tus mensajes.\n\nNunca antes te habías conectado a <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Un dispositivo que no es de confianza quiere acceder a tus contactos y al registro de llamadas. Presiona para ver más detalles"</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"¿Quieres permitir el acceso a los contactos y al registro de llamadas?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Un dispositivo Bluetooth que no es de confianza, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], quiere acceder a tus contactos y al registro de llamadas. Esto incluye datos sobre llamadas entrantes y salientes.\n\nNo te conectaste a [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] antes."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Un dispositivo Bluetooth que no es de confianza, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, quiere acceder a tus contactos y al registro de llamadas. Esto incluye datos sobre llamadas entrantes y salientes.\n\nNunca antes te habías conectado a <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Brillo"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Pantalla de bloqueo"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Visibilidad"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Color"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Otras opciones"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index cbc38df..7a3a7dd 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Hora de finalización"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Estado"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intensidad"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Desactivada / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"No se activará nunca automáticamente"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Se activará automáticamente a esta hora: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Se activará automáticamente al anochecer"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Activado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"No se desactivará nunca automáticamente"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Se desactivará automáticamente a esta hora: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Se desactivará automáticamente al amanecer"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Activar del anochecer al amanecer"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Activar a una hora personalizada"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Estado"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Desactivado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"No se activará nunca automáticamente"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Se activará automáticamente al anochecer"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Se activará automáticamente a las <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Activado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"No se desactivará nunca automáticamente"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Se desactivará automáticamente al amanecer"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Se desactivará automáticamente a las <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -1611,11 +1607,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Las aplicaciones se pueden reiniciar"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Recuperar Wi-Fi, red móvil y Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Se recuperarán todos los ajustes de red, como:\n\n"<li>"Wi‑Fi"</li>\n<li>"Datos móviles"</li>\n<li>"Bluetooth"</li></string>
-    <!-- no translation found for erase_euicc_data_button (728078969563311737) -->
-    <skip />
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Borrar"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Borrar las SIM descargadas"</string>
-    <!-- no translation found for reset_esim_desc (3662444090563399131) -->
-    <skip />
+    <string name="reset_esim_desc" msgid="3662444090563399131">"No se cancelará ningún plan de servicios móviles. Para descargar una tarjeta SIM de sustitución, ponte en contacto con tu operador."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Recuperar ajustes"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"¿Quieres restablecer la configuración de red? No podrás deshacer esta acción."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"¿Quieres recuperar todos los ajustes de red y borrar todas las SIM descargadas? No podrás deshacer esta acción."</string>
@@ -2138,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Lectores de pantalla"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio y texto en pantalla"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Pantalla"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Controles de interacción"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Aplicaciones descargadas"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Experimental"</string>
@@ -2458,8 +2454,7 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"El tablet se ha usado más de lo normal"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"El dispositivo se ha usado más de lo normal"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Quizás se agote la batería antes de lo normal"</string>
-    <!-- no translation found for battery_tip_limited_temporarily_title (7152799456221596915) -->
-    <skip />
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optimizando para preservar el estado de la batería"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Batería limitada temporalmente. Toca para ver más información."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Tu teléfono se ha usado más de lo normal y es posible te quedes sin batería antes de lo esperado.\n\nEstas son las aplicaciones que más batería consumen:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Tu tablet se ha usado más de lo normal y es posible te quedes sin batería antes de lo esperado.\n\nEstas son las aplicaciones que más batería consumen:"</string>
@@ -3078,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Eliminar usuario"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Eliminar"</string>
     <string name="user_guest" msgid="4545590092001460388">"Invitado"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Quitar invitado"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"¿Quitar invitado?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Borrar datos de invitados"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Finalizar sesión de invitado"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"¿Finalizar sesión de invitado?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Se eliminarán todas las aplicaciones y datos de esta sesión."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Quitar"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Finalizar sesión"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Activar llamadas"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Activar llamadas y SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Eliminar usuario"</string>
@@ -3594,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Conversaciones no prioritarias"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Conversaciones en las que has hecho cambios"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Conversaciones recientes"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Borrar recientes"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Borrar los recientes"</string>
     <string name="clear" msgid="5092178335409471100">"Borrar"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Convertir conversaciones prioritarias en burbujas"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Las conversaciones prioritarias se muestran en la parte superior del panel desplegable. También puedes configurarlas para que se muestren en burbujas y puedan interrumpirte aunque esté activado No molestar."</string>
@@ -4427,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Conectado a varios dispositivos"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Modo de demostración de UI del sistema"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Tema oscuro"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Activado / Inhabilitado temporalmente para ahorrar batería"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Activado temporalmente para ahorrar batería"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Las aplicaciones que lo admitan también se cambiarán al tema oscuro"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Entendido"</string>
@@ -5066,21 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferencias"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Conectarse a redes públicas"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"conexión de red, internet, inalámbrico, datos, wifi, wi-fi, wi fi, datos móviles, móvil, operador de telefonía, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Ver redes seguras para aviones"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Desactivar modo avión"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Ver redes disponibles en el modo avión"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Desactivar modo avión"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Conectada"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet no se conectará automáticamente"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"No hay otras redes disponibles"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"No hay redes disponibles"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"No disponible porque el modo Descanso está activado"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Borrado de la importancia de las notificaciones completado."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Aplicaciones"</string>
-    <!-- no translation found for bluetooth_message_access_notification_content (2986108412562309009) -->
-    <skip />
-    <!-- no translation found for bluetooth_message_access_dialog_title (9009836130395061579) -->
-    <skip />
-    <!-- no translation found for bluetooth_message_access_dialog_content (6004506637437582983) -->
-    <skip />
-    <!-- no translation found for bluetooth_phonebook_access_notification_content (4280361621526852063) -->
-    <skip />
-    <!-- no translation found for bluetooth_phonebook_access_dialog_title (7624607995928968721) -->
-    <skip />
-    <!-- no translation found for bluetooth_phonebook_access_dialog_content (2235876209172857819) -->
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Un dispositivo que no es de confianza quiere acceder a tus mensajes. Toca para consultar más información."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"¿Permitir acceso a los mensajes?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Un dispositivo Bluetooth que no es de confianza (<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>) quiere acceder a tus mensajes.\n\nEs la primera vez que te conectas a <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Un dispositivo que no es de confianza quiere acceder a tus contactos y a tu registro de llamadas. Toca para consultar más información."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"¿Permitir acceso a los contactos y al registro de llamadas?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Un dispositivo Bluetooth que no es de confianza (<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>) quiere acceder a tus contactos y a tu registro de llamadas, lo que incluye datos sobre llamadas entrantes y salientes.\n\nEs la primera vez que te conectas a <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Brillo"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Pantalla de bloqueo"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Visibilidad"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Color"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Otros"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
     <skip />
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index e294c19..6b8fe1e 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Lõppaeg"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Olek"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intensiivsus"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Väljas / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Ei lülitu kunagi automaatselt sisse"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Lülitub automaatselt sisse kell <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Lülitub automaatselt sisse päikeseloojangul"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Sees / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Ei lülitu kunagi automaatselt välja"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Lülitub automaatselt välja kell <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Lülitub automaatselt välja päikesetõusul"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Sees loojangust päikesetõusuni"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Lülitub sisse kohandatud ajal"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Olek"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Väljas / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Ei lülitu kunagi automaatselt sisse"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Lülitub automaatselt sisse päikeseloojangul"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Lülitub automaatselt sisse kell <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Sees / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Ei lülitu kunagi automaatselt välja"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Lülitub automaatselt välja päikesetõusul"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Lülitub automaatselt välja kell <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -1609,11 +1605,11 @@
     <string name="reset_dashboard_title" msgid="7423200250697886918">"Lähtestamise valikud"</string>
     <string name="reset_dashboard_summary" msgid="4390780188264852956">"Võrgu, rakendused või seadme saab lähtestada"</string>
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Rakendused saab lähtestada"</string>
-    <string name="reset_network_title" msgid="1395494440355807616">"Lähtesta WiFi, mobiilne andmeside ja Bluetooth"</string>
+    <string name="reset_network_title" msgid="1395494440355807616">"WiFi, mobiilse andmeside ja Bluetoothi lähtestamine"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"See lähtestab kõik võrguseaded, sh:\n\n"<li>"WiFi"</li>\n<li>"Mobiilne andmeside"</li>\n<li>"Bluetooth"</li></string>
     <string name="erase_euicc_data_button" msgid="728078969563311737">"Kustuta"</string>
-    <string name="reset_esim_title" msgid="6152167073280852849">"Kustuta allalaaditud SIM-id"</string>
-    <string name="reset_esim_desc" msgid="3662444090563399131">"See ei tühista mobiilsideteenuse pakette. Asendus-SIM-kaartide allalaadimiseks võtke ühendust operaatoriga."</string>
+    <string name="reset_esim_title" msgid="6152167073280852849">"Allalaaditud SIM-ide kustutamine"</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"See ei tühista mobiilsideteenuse pakette. Asendus-SIM-ide allalaadimiseks võtke ühendust operaatoriga."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Lähtesta seaded"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Kas soovite kõik võrguseaded lähtestada? Seda toimingut ei saa tagasi võtta."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Kas soovite kõik võrguseaded lähtestada ja allalaaditud SIM-id kustutada? Seda toimingut ei saa tagasi võtta."</string>
@@ -1623,7 +1619,7 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Võrguseaded lähtestati"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM-kaarte ei saa kustutada"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Allalaaditud SIM-kaarte ei saa vea tõttu kustutada.\n\nTaaskäivitage seade ja proovige uuesti."</string>
-    <string name="main_clear_title" msgid="277664302144837723">"Kustuta kõik andmed (tehaseseadetele lähtestamine)"</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Kõikide andmete kustutamine (tehaseseadetele lähtestamine)"</string>
     <string name="main_clear_short_title" msgid="4752094765533020696">"Kõigi andmete kustutamine (tehaseseaded)"</string>
     <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"See kustutab teie tahvelarvuti "<b>"sisemälust"</b>" kõik andmed, sh järgmised.\n\n"<li>"Teie Google\'i konto"</li>\n<li>"Süsteemi- ja rakenduste andmed ning seaded"</li>\n<li>"Allalaaditud rakendused"</li></string>
     <string name="main_clear_desc" product="default" msgid="6984348811887162647">"See kustutab teie telefoni "<b>"sisemälust"</b>" kõik andmed, sh järgmised.\n\n"<li>"Teie Google\'i konto"</li>\n<li>"Süsteemi- ja rakenduste andmed ning seaded"</li>\n<li>"Allalaaditud rakendused"</li></string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Ekraanilugejad"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Heli ja ekraanil kuvatud tekst"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Ekraan"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Interaktsiooni juhtnupud"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Allalaaditud rakendused"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Katseline"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Kasutaja kustutamine"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Kustuta"</string>
     <string name="user_guest" msgid="4545590092001460388">"Külaline"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Eemalda külaline"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Kas eemaldada külaline?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Kustuta külalise andmed"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Lõpeta külastajaseanss"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Kas lõpetada külastajaseanss?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Seansi kõik rakendused ja andmed kustutatakse."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Eemalda"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Lõpeta seanss"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Lülita telefonikõned sisse"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Lülita telefonikõned ja SMS-id sisse"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Kustuta kasutaja"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Vähemtähtsad vestlused"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Vestlused, milles olete muudatusi teinud"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Hiljutised vestlused"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Kustuta hiljutised"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Kustuta kõik hiljutised"</string>
     <string name="clear" msgid="5092178335409471100">"Kustuta"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Kuva prioriteetsed vestlused mullis"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Prioriteetsed vestlused kuvatakse allatõmmatava ala ülaosas. Saate lasta need kuvada ka mullis ja katkestada funktsiooni Mitte segada."</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Ühendatud mitme seadmega"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Süsteemi kasutajaliidese demorežiim"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Tume teema"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Sees / akusäästja tõttu ajutiselt keelatud"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Akusäästja tõttu ajutiselt sisse lülitatud"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Toetatud rakendused aktiveerivad samuti tumeda teema"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Selge"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Eelistused"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Ühenda avalike võrkudega"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"võrguühendus, internet, juhtmeta, andmeside, wifi, wi-fi, wi fi, mobiilside, mobiilsideoperaator, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Kuva lennukikindlad võrgud"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Lennukirežiimi väljalülitamine"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Kuva lennukirežiimi võrgud"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Lülita lennukirežiim välja"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Ühendatud"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Internetiühendust ei looda automaatselt"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Ühtegi muud võrku pole saadaval"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Ühtegi võrku pole saadaval"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Pole saadaval, kuna uneaja režiim on sisse lülitatud"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Märguande olulisuse lähtestamine viidi lõpule."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Rakendused"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Ebausaldusväärne seade soovib saada juurdepääsu teie sõnumitele. Puudutage üksikasjade nägemiseks."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Kas lubada juurdepääs sõnumitele?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Ebausaldusväärne Bluetooth-seade [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] soovib saada juurdepääsu teie sõnumitele.\n\nTe pole seadmega [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] varem ühendust loonud."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Ebausaldusväärne Bluetooth-seade <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> soovib saada juurdepääsu teie sõnumitele.\n\nTe pole seadmega <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> varem ühendust loonud."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Ebausaldusväärne seade soovib saada juurdepääsu teie kontaktidele ja kõnelogile. Puudutage üksikasjade nägemiseks."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Kas lubada juurdepääs kontaktidele ja kõnelogile?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Ebausaldusväärne Bluetooth-seade [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] soovib saada juurdepääsu teie kontaktidele ja kõnelogile. See hõlmab andmeid sissetulevate ja väljuvate kõnede kohta.\n\nTe pole seadmega [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] varem ühendust loonud."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Ebausaldusväärne Bluetooth-seade <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> soovib saada juurdepääsu teie kontaktidele ja kõnelogile. See hõlmab andmeid sissetulevate ja väljuvate kõnede kohta.\n\nTe pole seadmega <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> varem ühendust loonud."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Eredus"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Ekraani lukustamine"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Nähtavus"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Värv"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Muud"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 905d11f..61c9d00 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Amaiera-ordua"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Egoera"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intentsitatea"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Desaktibatuta / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Ez da aktibatuko inoiz automatikoki"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Ordu honetan aktibatuko da automatikoki: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Iluntzean aktibatuko da automatikoki"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Aktibatuta / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Ez da desaktibatuko inoiz automatikoki"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Ordu honetan desaktibatuko da automatikoki: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Egunsentian desaktibatuko da automatikoki"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Ilunabarretik egunsentira"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Ordu jakinetan aktibatzen da"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Egoera"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Desaktibatuta / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Ez da aktibatuko inoiz automatikoki"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Ilunabarrean aktibatuko da automatikoki"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Ordu honetan aktibatuko da automatikoki: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Aktibatuta / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Ez da desaktibatuko inoiz automatikoki"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Egunsentian desaktibatuko da automatikoki"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Ordu honetan desaktibatuko da automatikoki: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Pantaila-irakurgailuak"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audioa eta pantailako testua"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Pantaila"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Interakzioa kontrolatzeko aukerak"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Deskargatutako aplikazioak"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Esperimentalak"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Ezabatu erabiltzailea"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Ezabatu"</string>
     <string name="user_guest" msgid="4545590092001460388">"Gonbidatua"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Kendu gonbidatua"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Gonbidatua kendu nahi duzu?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Garbitu gonbidatuen datuak"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Amaitu gonbidatuentzako saioa"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Gonbidatuentzako saioa amaitu nahi duzu?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Saioko aplikazio eta datu guztiak ezabatuko dira."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Kendu"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Amaitu saioa"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Aktibatu telefono-deiak"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Aktibatu telefono-deiak eta SMS mezuak"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Ezabatu erabiltzailea"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Lehentasunezkoak ez diren elkarrizketak"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Aldatu dituzun elkarrizketak"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Azken elkarrizketak"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Garbitu azkenak"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Garbitu azkenak"</string>
     <string name="clear" msgid="5092178335409471100">"Garbitu"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Bistaratu lehentasunezko elkarrizketak burbuila gainerakor gisa"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Lehentasunezko elkarrizketak goitibeherako barraren goialdean agertzen dira. Nahi izanez gero, burbuila gisa ikus ditzakezu, ez molestatzeko moduan salbuespen izan daitezen."</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Gailu batera baino gehiagotara konektatuta"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Sistemaren erabiltzaile-interfazearen demo modua"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Gai iluna"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Aktibatuta. Aldi baterako desgaitu du bateria-aurrezleak."</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Aldi baterako aktibatu du bateria-aurrezleak"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Aplikazio bateragarriak ere aldatuko dira gai ilunera"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Ados"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Hobespenak"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Konektatu sare publikoetara"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"sareko konexioa, internet, hari gabeko konexioak, datuak, wifia, mugikorra, telefono mugikorra, operadorea, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Ikusi hegaldietarako seguruak diren sareak"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Desaktibatu hegaldi modua"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Ikusi hegaldi moduko sareak"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Desaktibatu hegaldi modua"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Konektatuta"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Ez da automatikoki konektatuko Internetera"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Ez dago beste sare erabilgarririk"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Ez dago sare erabilgarririk"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Ez dago erabilgarri, lo egiteko garaiaren modua aktibatuta dagoelako"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Berrezarri da jakinarazpenen garrantzia."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Aplikazioak"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Fidagarria ez den gailu batek zure mezuak atzitu nahi ditu. Sakatu xehetasunak ikusteko."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Mezuak atzitzeko baimena eman nahi diozu?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Fidagarria ez den Bluetooth bidezko gailu batek ([<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]) zure mezuak atzitu nahi ditu.\n\nEz zara inoiz konektatu [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] gailura."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Fidagarria ez den Bluetooth bidezko gailu bat, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, zure mezuak atzitu nahian dabil.\n\nEz zara inoiz konektatu <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> gailura."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Fidagarria ez den gailu batek zure kontaktuak eta deien historia atzitu nahi ditu. Sakatu xehetasunak ikusteko."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Kontaktuak eta deien historia atzitzeko baimena eman nahi diozu?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Fidagarria ez den Bluetooth bidezko gailu batek ([<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]) zure kontaktuak eta deien historia atzitu nahi ditu. Hor sartzen dira jasotako eta egindako deiei buruzko datuak.\n\nEz zara inoiz konektatu [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] gailura."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Fidagarria ez den Bluetooth bidezko gailu bat, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, zure kontaktuak eta deien erregistroa atzitu nahian dabil. Jasotako eta egindako deiei buruzko datuak hartzen dira barnean.\n\nEz zara inoiz konektatu <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> gailura."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Distira"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Blokeatu pantaila"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Ikusgaitasuna"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Kolorea"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Beste batzuk"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index f801e7c..6f0851c 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"زمان پایان"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"وضعیت"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"شدت"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"خاموش / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"هرگز به‌طور خودکار روشن نمی‌شود"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"در ساعت <xliff:g id="ID_1">%1$s</xliff:g> به‌طور خودکار روشن می‌شود"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"در غروب به‌طور خودکار روشن می‌شود"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"روشن / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"هرگز به‌طور خودکار خاموش نمی‌شود"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"در ساعت <xliff:g id="ID_1">%1$s</xliff:g> به‌طور خودکار خاموش می‌شود"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"به‌طور خودکار در طلوع خاموش می‌شود"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"از غروب تا طلوع روشن می‌شود"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"در زمان سفارشی روشن می‌شود"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"وضعیت"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"خاموش / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"هرگز به‌طور خودکار روشن نمی‌شود"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"در غروب به‌طور خودکار روشن می‌شود"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"در ساعت <xliff:g id="ID_1">%1$s</xliff:g> به‌طور خودکار روشن می‌شود"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"روشن / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"هرگز به‌طور خودکار خاموش نمی‌شود"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"به‌طور خودکار در طلوع خاموش می‌شود"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"در ساعت <xliff:g id="ID_1">%1$s</xliff:g> به‌طور خودکار خاموش می‌شود"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"صفحه‌خوان‌ها"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"صدا و نوشتار روی صفحه"</string>
     <string name="display_category_title" msgid="6638191682294461408">"نمایشگر"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"کنترل‌های تعامل"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"برنامه‌های بارگیری‌شده"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"آزمایشی"</string>
@@ -3075,10 +3073,15 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"حذف کاربر"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"حذف"</string>
     <string name="user_guest" msgid="4545590092001460388">"مهمان"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"حذف مهمان"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"مهمان حذف شود؟"</string>
+    <!-- no translation found for user_clear_guest_menu (4864362688187480452) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_menu (5064400453222497734) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_confirm_title (7526978959527761497) -->
+    <skip />
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"همه برنامه‌ها و داده‌های این جلسه حذف خواهد شد."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"حذف"</string>
+    <!-- no translation found for user_exit_guest_dialog_remove (8095094235815676847) -->
+    <skip />
     <string name="user_enable_calling" msgid="264875360626905535">"روشن کردن تماس‌های تلفنی"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"روشن کردن تماس‌های تلفنی و پیامک"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"حذف کاربر"</string>
@@ -3591,7 +3594,8 @@
     <string name="other_conversations" msgid="551178916855139870">"مکالمه‌های بدون اولویت"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"مکالمه‌هایی که در آن‌ها تغییر ایجاد کرده‌اید"</string>
     <string name="recent_conversations" msgid="471678228756995274">"مکالمه‌های اخیر"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"پاک کردن موارد اخیر"</string>
+    <!-- no translation found for conversation_settings_clear_recents (4246342656145488662) -->
+    <skip />
     <string name="clear" msgid="5092178335409471100">"پاک کردن"</string>
     <string name="important_bubble" msgid="7911698275408390846">"نمایش مکالمه اولویت‌دار به‌صورت حباب"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"مکالمه‌های اولویت‌دار در بالای کشوی پایین‌پر نمایش داده می‌شوند. به‌علاوه می‌توانید تنظیم کنید به‌صورت حباب ظاهر شوند و در حالت «مزاحم نشوید» وقفه ایجاد کنند."</string>
@@ -4424,7 +4428,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"به چند دستگاه متصل شد"</string>
     <string name="demo_mode" msgid="6566167465451386728">"حالت نمایشی رابط کاربری سیستم"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"طرح زمینه تیره"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"روشن/ به‌دلیل روشن بودن «بهینه‌سازی باتری»، موقتاً غیرفعال شد"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"به‌دلیل روشن بودن «بهینه‌سازی باتری»، این تنظیم موقتاً فعال شد"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"برنامه‌های پشتبانی‌شده نیز به طرح زمینه تیره تغییر می‌کنند"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"متوجه شدم"</string>
@@ -5063,15 +5068,34 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"اولویت‌ها"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"اتصال به شبکه‌های عمومی"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"‏اتصال شبکه، اینترنت، بی‌سیم، داده، wifi،‏ wi-fi، ‏wi fi، شبکه تلفن همراه، تلفن همراه، شرکت مخابراتی تلفن همراه، 4g،‏ 3g،‏ 2g،‏ lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"مشاهده شبکه‌های ایمن در هواپیما"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"خاموش کردن «حالت هواپیما»"</string>
+    <!-- no translation found for view_airplane_safe_networks (9170023210981508906) -->
+    <skip />
+    <!-- no translation found for turn_off_airplane_mode (7141986366534514443) -->
+    <skip />
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"متصل‌شده"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"اینترنت به‌طور خودکار متصل نخواهد شد"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"شبکه دیگری وجود ندارد"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"شبکه‌ای در دسترس نیست"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"دردسترس نیست زیرا «حالت وقت خواب» روشن است"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"بازنشاندن اهمیت اعلان تکمیل شد."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"برنامه‌ها"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"دستگاه غیرمطمئنی می‌خواهد به پیام‌هایتان دسترسی داشته باشد. برای دیدن جزئیات، ضربه بزنید."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"دسترسی به پیام‌ها مجاز شود؟"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"دستگاه بلوتوث غیرمطمئنی، [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]، می‌خواهد به پیام‌هایتان دسترسی داشته باشد.\n\nتاکنون به [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] متصل نشده‌اید."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"دستگاه بلوتوث غیرمطمئنی (<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>) می‌خواهد به پیام‌هایتان دسترسی داشته باشد.\n\nتاکنون به <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> متصل نشده‌اید."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"دستگاه غیرمطمئنی می‌خواهد به مخاطبین و گزارش تماس شما دسترسی داشته باشد. برای دیدن جزئیات، ضربه بزنید."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"دسترسی به مخاطبین و گزارش تماس مجاز شود؟"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"دستگاه بلوتوث غیرمطمئنی، [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]، می‌خواهد به مخاطبین و گزارش تماس شما دسترسی داشته باشد. این شامل داده‌های مربوط به تماس‌های ورودی و خروجی می‌شود.\n\nتاکنون به [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] متصل نشده‌اید."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"دستگاه بلوتوث غیرمطمئنی (<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>) می‌خواهد به مخاطبین و گزارش تماس شما دسترسی داشته باشد. این شامل داده‌های مربوط به تماس‌های ورودی و خروجی می‌شود.\n\nتاکنون به <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> متصل نشده‌اید."</string>
+    <!-- no translation found for category_name_brightness (8520372392029305084) -->
+    <skip />
+    <!-- no translation found for category_name_lock_display (7478785189102882266) -->
+    <skip />
+    <!-- no translation found for category_name_visibility (4485030512199246405) -->
+    <skip />
+    <!-- no translation found for category_name_color (937514550918977151) -->
+    <skip />
+    <!-- no translation found for category_name_others (2366006298768550310) -->
+    <skip />
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 150f98b..a78eeeb 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -178,7 +178,7 @@
     <string name="proxy_error_empty_port" msgid="4250295137005082992">"Täytä porttikenttä."</string>
     <string name="proxy_error_empty_host_set_port" msgid="8886572276450900049">"Portti-kentän täytyy olla tyhjä, jos isäntä-kenttä on tyhjä."</string>
     <string name="proxy_error_invalid_port" msgid="2830054691770209166">"Antamasi portti on virheellinen."</string>
-    <string name="proxy_warning_limited_support" msgid="3277104160797351942">"Selain saa käyttää HTTP-välityspalvelinta mutta muut sovellukset eivät."</string>
+    <string name="proxy_warning_limited_support" msgid="3277104160797351942">"Selain käyttää HTTP-välityspalvelinta, mutta muut sovellukset mahdollisesti eivät."</string>
     <string name="proxy_url_title" msgid="3502625766036404073">"Välitysp. aut. määr. URL: "</string>
     <string name="radio_info_ping_hostname_v4" msgid="4790577760885127088">"Ping-kutsu isäntänimelle (www.google.com), IPv4:"</string>
     <string name="radio_info_ping_hostname_v6" msgid="8327436534663560713">"Ping-kutsu isäntänimelle (www.google.com), IPv6:"</string>
@@ -789,9 +789,9 @@
     <string name="wifi_time_remaining" msgid="8503606272869846170">"<xliff:g id="REMAINING_TIME">%1$s</xliff:g> jäljellä"</string>
     <string name="wifi_expiry_time" msgid="5419758551129267624">"Vanhenee <xliff:g id="EXPIRY_TIME">%1$s</xliff:g>"</string>
     <string name="wifi_tap_to_sign_in" msgid="8658506618807549483">"Napauta tästä kirjautuaksesi verkkoon"</string>
-    <string name="tx_link_speed" msgid="3071955184703668113">"<xliff:g id="TRANSMIT_LINK_SPEED">%1$d</xliff:g> Mt/s"</string>
-    <string name="rx_link_speed" msgid="6292229178855567783">"<xliff:g id="RECEIVE_LINK_SPEED">%1$d</xliff:g> Mt/s"</string>
-    <string name="link_speed" msgid="931786745741016446">"<xliff:g id="LINK_SPEED">%1$d</xliff:g> Mt/s"</string>
+    <string name="tx_link_speed" msgid="3071955184703668113">"<xliff:g id="TRANSMIT_LINK_SPEED">%1$d</xliff:g> Mb/s"</string>
+    <string name="rx_link_speed" msgid="6292229178855567783">"<xliff:g id="RECEIVE_LINK_SPEED">%1$d</xliff:g> Mb/s"</string>
+    <string name="link_speed" msgid="931786745741016446">"<xliff:g id="LINK_SPEED">%1$d</xliff:g> Mb/s"</string>
     <string name="wifi_ask_enable" msgid="6860056048266810769">"<xliff:g id="REQUESTER">%s</xliff:g> haluaa ottaa Wi-Fin käyttöön."</string>
     <string name="wifi_ask_disable" msgid="1663208096020309639">"<xliff:g id="REQUESTER">%s</xliff:g> haluaa poistaa Wi-Fin käytöstä."</string>
     <string name="art_verifier_for_debuggable_title" msgid="1926445785190030479">"Vahvista korjattavien sovell. tavukoodi"</string>
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Päättymisaika"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Tila"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Voimakkuus"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Pois päältä / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Ei käynnisty automaattisesti"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Käynnistyy automaattisesti kello <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Käynnistyy automaattisesti, kun aurinko laskee"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Päällä / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Ei sammu automaattisesti"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Sammuu automaattisesti kello <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Sammuu automaattisesti, kun aurinko nousee"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Auringonlaskusta sen nousuun"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Menee päälle valitsemaasi aikaan"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Tila"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Pois päältä / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Ei käynnisty automaattisesti"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Käynnistyy automaattisesti, kun aurinko laskee"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Menee automaattisesti päälle kello <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Päällä / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Ei sammu automaattisesti"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Sammuu automaattisesti, kun aurinko nousee"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Menee automaattisesti pois päältä kello <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Näytönlukuohjelmat"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Ääni ja näyttöteksti"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Näyttö"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Käytönhallinta"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Ladatut sovellukset"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Kokeellinen"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Poista käyttäjä"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Poista"</string>
     <string name="user_guest" msgid="4545590092001460388">"Vieras"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Poista vieras"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Poistetaanko vieras?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Tyhjennä vierailijadata"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Lopeta Vierailija-käyttökerta"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Lopetetaanko Vierailija-käyttökerta?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Kaikki sovellukset ja tämän istunnon tiedot poistetaan."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Poista"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Lopeta käyttökerta"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Ota puhelut käyttöön"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Ota puhelut ja tekstiviestit käyttöön"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Poista käyttäjä"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Vähemmän tärkeät keskustelut"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Keskustelut, joihin teit muutoksia"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Uusimmat keskustelut"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Tyhjennä uusimmat"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Tyhjennä äskeiset"</string>
     <string name="clear" msgid="5092178335409471100">"Tyhjennä"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Näytä kuplia tärkeistä keskusteluista"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Tärkeät keskustelut näkyvät vedettävän ilmoitusalueen yläreunassa. Voit myös valita, että ne näkyvät kuplina ja keskeyttävät Älä häiritse ‑tilan."</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Yhdistetty useisiin laitteisiin"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Käyttöliittymän esittelytila"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Tumma teema"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Päällä / tilapäisesti poissa virransäästön takia"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Tilapäisesti päällä virransäästön takia"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Myös tuetut sovellukset vaihtavat tummaan teemaan"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"OK"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Valinnat"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Yhdistä julkisiin verkkoihin"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"verkkoyhteys, internet, langaton, data, langaton yhteys, Wi-Fi, Wi Fi, datayhteys, mobiili, puhelinoperaattori, 4g, 3g, 2g, LTE"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Näytä lentokoneturvalliset verkot"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Laita lentokonetila pois päältä"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Näytä lentokonetilan verkot"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Laita lentokonetila pois päältä"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Yhdistetty"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Internetyhteyttä ei muodosteta automaattisesti"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Ei muita verkkoja käytettävissä"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Ei verkkoja käytettävissä"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Ei käytettävissä, koska Nukkuma-aikamoodi on päällä"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Ilmoitusten tärkeys nollattu"</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Sovellukset"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Epäluotettava laite pyytää pääsyä viesteihisi. Katso lisätietoja napauttamalla."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Sallitaanko pääsy viesteihin?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Epäluotettava Bluetooth-laite, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], pyytää pääsyä viesteihisi.\n\n[<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ei ole ennen ollut yhteydessä laitteeseesi."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Epäluotettava Bluetooth-laite, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, pyytää pääsyä viesteihisi.\n\n<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> ei ole ennen ollut yhteydessä laitteeseesi."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Epäluotettava laite pyytää pääsyä yhteystietoihisi ja puhelulokiisi. Katso lisätietoja napauttamalla."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Sallitaanko pääsy yhteystietoihin ja puhelulokiin?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Epäluotettava Bluetooth-laite, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], pyytää pääsyä yhteystietoihisi ja puhelulokiisi. Tämä sisältää datan saapuvista ja lähtevistä puheluista.\n\n[<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ei ole ennen ollut yhteydessä laitteeseesi."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Epäluotettava Bluetooth-laite, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, pyytää pääsyä yhteystietoihisi ja puhelulokiisi. Tämä sisältää datan saapuvista ja lähtevistä puheluista.\n\n<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> ei ole ennen ollut yhteydessä laitteeseesi."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Kirkkaus"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Lukitusnäyttö"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Näkyvyys"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Väri"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Muu"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index f652f33..81eb430 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Heure de fin"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"État"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intensité"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Désactivé : <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Ne s\'activera jamais automatiquement"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"S\'activera automatiquement à <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"S\'activera automatiquement au coucher du soleil."</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Activé : <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Ne se désactivera jamais automatiquement"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Se désactivera automatiquement à <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Se désactivera automatiquement au lever du soleil"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Actif toute la nuit"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"S\'active à l\'heure de votre choix"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"État"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Désactivé : <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Ne s\'activera jamais automatiquement"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"S\'activera automatiquement au coucher du soleil."</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"S\'activera automatiquement à <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Activé : <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Ne se désactivera jamais automatiquement"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Se désactivera automatiquement au lever du soleil"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Se désactivera automatiquement à <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Lecteurs d\'écran"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio et texte à l\'écran"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Affichage"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Commandes d\'interaction"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Applications téléchargées"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Fonctions expérimentales"</string>
@@ -2456,7 +2454,7 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"La tablette a été sollicitée plus que d\'habitude"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"L\'appareil a été sollicité plus que d\'habitude"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"La pile pourrait s\'épuiser plus tôt que d\'habitude"</string>
-    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optimisation en fonction de la santé de la pile"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optimisation pour préserver la pile"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Pile limitée temporairement. Touchez ici pour en savoir plus."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Votre téléphone a été sollicité plus que d\'habitude. Sa pile pourrait s\'épuiser plus rapidement que prévu.\n\nVoici les applications qui ont utilisé le plus d\'énergie :"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Votre tablette a été sollicitée plus que d\'habitude. Sa pile pourrait s\'épuiser plus rapidement que prévu.\n\nVoici les applications qui ont utilisé le plus d\'énergie :"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Supprimer l\'utilisateur"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Supprimer"</string>
     <string name="user_guest" msgid="4545590092001460388">"Invité"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Supprimer l\'invité"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Supprimer l\'invité?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Effacer les données d\'invités"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Mettre fin à la session d\'invité"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Mettre fin à la session d\'invité?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Toutes les applications et les données de cette session seront supprimées."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Supprimer"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Fermer la session"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Activer les appels téléphoniques"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Activer appels téléphoniques et textos"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Supprimer l\'utilisateur"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Conversations non prioritaires"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Conversations auxquelles vous avez apporté des modifications"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Conversations récentes"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Eff. celles récentes"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Effacer récents"</string>
     <string name="clear" msgid="5092178335409471100">"Effacer"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Afficher les conversations prioritaires en bulles"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Les conversations prioritaires s\'affichent dans le haut du volet déroulant. Vous pouvez aussi les configurer pour qu\'elles s\'affichent dans des bulles et interrompent le mode Ne pas déranger."</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Connecté à plusieurs appareils"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Mode de démonstration de l\'interface système"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Thème sombre"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Activé/Temporairement désactivé par l\'économiseur de pile"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Temporairement activé par l\'économiseur de pile"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Les applications compatibles utiliseront aussi le thème sombre"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"OK"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Préférences"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Se connecter aux réseaux publics"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"connexion réseau, internet, sans fil, données, wifi, wi-fi, wi fi, cellulaire, mobile, fournisseur cellulaire, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Voir réseaux sécuritaires pour les avions"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Désactiver le mode Avion"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Afficher les réseaux du mode Avion"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Désactiver le mode Avion"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> : <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Connexion active"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Imposs. de se connecter automatiquement à Internet"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Aucun autre réseau n\'est accessible"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Aucun réseau n\'est accessible"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Cette fonctionnalité n\'est pas accessible parce que le mode Nuit est activé"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"L\'importance de la notification a bien été réinitialisée."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Applications"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Un appareil non vérifié souhaite accéder à vos messages. Touchez l\'écran pour en savoir plus."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Autoriser l\'accès aux messages?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Un appareil Bluetooth non vérifié, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], souhaite accéder à vos messages.\n\nVous ne vous êtes jamais connecté à [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] auparavant."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Un appareil Bluetooth non vérifié, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, souhaite accéder à vos messages.\n\nVous ne vous êtes jamais connecté à <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> auparavant."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Un appareil non vérifié veut accéder à vos contacts et à votre journal d\'appels. Touchez l\'écran pour en savoir plus."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Autoriser l\'accès aux contacts et au journal d\'appels?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Un appareil Bluetooth non vérifié, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], souhaite accéder à vos contacts et à votre journal d\'appels. Cela comprend des données concernant les appels entrants et sortants.\n\nVous ne vous êtes jamais connecté à [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] auparavant."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Un appareil Bluetooth non vérifié, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, souhaite accéder à vos contacts et à votre journal d\'appels. Cela comprend des données à propos des appels entrants et sortants.\n\nVous ne vous êtes jamais connecté à <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> auparavant."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Luminosité"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Verrouiller l\'écran"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Visibilité"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Couleur"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Autres"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index a2f0b23..d00ea18 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Heure de fin"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"État"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intensité"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Désactivé - <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Ne s\'activera jamais automatiquement"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Activer automatiquement à <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Activer automatiquement au coucher du soleil"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Activé - <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Ne jamais désactiver automatiquement"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Désactiver automatiquement à <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Désactiver automatiquement au lever du soleil"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Actif toute la nuit"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Activer à une heure définie"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"État"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Désactivé - <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Ne s\'activera jamais automatiquement"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Activer automatiquement au coucher du soleil"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Activer automatiquement à <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Activé - <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Ne jamais désactiver automatiquement"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Désactiver automatiquement au lever du soleil"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Désactiver automatiquement à <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Lecteurs d\'écran"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio et texte à l\'écran"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Écran"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Commandes d\'interaction"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Applications téléchargées"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Paramètres expérimentaux"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Supprimer l\'utilisateur"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Supprimer"</string>
     <string name="user_guest" msgid="4545590092001460388">"Invité"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Supprimer l\'invité"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Supprimer l\'invité ?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Effacer les données"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Fermer la session Invité"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Fermer la session Invité ?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Toutes les applications et les données de cette session seront supprimées."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Supprimer"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Fermer la session"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Activer les appels téléphoniques"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Activer les appels téléphoniques et les SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Supprimer un compte utilisateur"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Conversations non prioritaires"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Conversations auxquelles vous avez apporté des modifications"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Conversations récentes"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Effacer les conversations récentes"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Effacer les récents"</string>
     <string name="clear" msgid="5092178335409471100">"Effacer"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Afficher les conversations prioritaires sous forme de bulle"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Les conversations prioritaires s\'affichent en haut du volet déroulant. Vous pouvez aussi les configurer pour s\'afficher dans des bulles et les autoriser à interrompre le mode Ne pas déranger."</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Connecté à plusieurs appareils"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Mode de démonstration de l\'interface du système"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Thème sombre"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Temporairement désactivé par l\'économiseur de batterie"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Temporairement activé par l\'économiseur de batterie"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Le thème sombre s\'appliquera également aux applications compatibles."</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"OK"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Préférences"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Se connecter aux réseaux publics"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"connexion réseau, internet, sans fil, données, wifi, wi-fi, wi fi, cellulaire, mobile, opérateur mobile, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Afficher les réseaux acceptés en avion"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Désactivez le mode Avion"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Afficher les réseaux du mode Avion"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Désactiver le mode Avion"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Connecté"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Connexion Internet automatique impossible"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Aucun autre réseau disponible"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Aucun réseau disponible"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Indisponible, car le mode Heure du coucher est activé"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"L\'importance de la notification a bien été réinitialisée."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Applications"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Un appareil non vérifié souhaite accéder à vos messages. Appuyez ici pour plus de détails."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Autoriser l\'accès aux messages ?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Un appareil Bluetooth non vérifié, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], souhaite accéder à vos messages.\n\nVous ne vous êtes jamais connecté à [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] auparavant."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Un appareil Bluetooth non vérifié, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, souhaite accéder à vos messages.\n\nVous ne vous êtes jamais connecté à <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> auparavant."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Un appareil non vérifié souhaite accéder à vos contacts et à votre journal d\'appels. Appuyez ici pour plus de détails."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Autoriser l\'accès aux contacts et au journal d\'appels ?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Un appareil Bluetooth non vérifié, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], souhaite accéder à vos contacts et à votre journal d\'appels. Ceci inclut des données concernant les appels entrants et sortants.\n\nVous ne vous êtes jamais connecté à [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] auparavant."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Un appareil Bluetooth non vérifié, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, souhaite accéder à vos contacts et à votre journal d\'appels. Ceci inclut des données concernant les appels entrants et sortants.\n\nVous ne vous êtes jamais connecté à <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> auparavant."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Luminosité"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Écran de verrouillage"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Visibilité"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Couleur"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Autres"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 8b0e44b..67ca4a2 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Hora de finalización"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Estado"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intensidade"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Desactivado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Nunca se activará automaticamente"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Activarase automaticamente á seguinte hora: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Activarase automaticamente ao anoitecer"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Activado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Nunca se desactivará automaticamente"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Desactivarase automaticamente á seguinte hora: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Desactivarase automaticamente ao amencer"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Actívase do solpor ao amencer"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Actívase no horario escollido"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Estado"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Desactivado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Nunca se activará automaticamente"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Activarase automaticamente ao solpor"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Activarase automaticamente ás: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Activado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Nunca se desactivará automaticamente"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Desactivarase automaticamente ao amencer"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Desactivarase automaticamente ás: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -1675,8 +1671,8 @@
     <string name="tether_settings_summary_off" msgid="2526164899130351968">"Non se está compartindo a conexión a Internet con outros dispositivos"</string>
     <string name="tethering_interface_options" msgid="7575535888135143650">"Conexión compartida"</string>
     <string name="disable_wifi_hotspot_title" msgid="2167985468585290478">"Non utilizar zona wifi"</string>
-    <string name="disable_wifi_hotspot_when_usb_on" msgid="220439059794714583">"Compartir Internet só por USB"</string>
-    <string name="disable_wifi_hotspot_when_bluetooth_on" msgid="4711723299880116345">"Compartir Internet só por Bluetooth"</string>
+    <string name="disable_wifi_hotspot_when_usb_on" msgid="220439059794714583">"Comparte Internet só por USB"</string>
+    <string name="disable_wifi_hotspot_when_bluetooth_on" msgid="4711723299880116345">"Comparte Internet só por Bluetooth"</string>
     <string name="disable_wifi_hotspot_when_ethernet_on" msgid="4123242400542103599">"Comparte Internet só por Ethernet"</string>
     <string name="disable_wifi_hotspot_when_usb_and_bluetooth_on" msgid="5258774769658150180">"Compartirase Internet só por USB e Bluetooth"</string>
     <string name="disable_wifi_hotspot_when_usb_and_ethernet_on" msgid="7126313562907225612">"Comparte Internet só por USB e Ethernet"</string>
@@ -1692,7 +1688,7 @@
     <string name="bluetooth_tethering_off_subtext_config" msgid="6941934844527406581">"Compartindo a conexión a Internet de <xliff:g id="DEVICE_NAME">%1$d</xliff:g> por Bluetooth"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Non se pode compartir a conexión con máis de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivos"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Desactivarase a conexión compartida de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet compartida"</string>
+    <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Conexión por Ethernet"</string>
     <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Comparte a conexión a Internet do teléfono por Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Utiliza a zona wifi e a conexión compartida para ofrecer acceso a Internet a outros dispositivos mediante a túa conexión de datos móbiles. As aplicacións tamén poden crear unha zona wifi para compartir contido cos dispositivos que están cerca."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Utiliza a zona wifi e a conexión compartida para ofrecer acceso a Internet a outros dispositivos mediante a túa wifi ou a túa conexión de datos móbiles. As aplicacións tamén poden crear unha zona wifi para compartir contido cos dispositivos que están cerca."</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Lectores de pantalla"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio e texto na pantalla"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Pantalla"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Controis de interacción"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Aplicacións descargadas"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Experimental"</string>
@@ -2456,7 +2454,7 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Utilizouse a tableta máis do normal"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Utilizouse o dispositivo máis do normal"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"A batería pode esgotarse antes do normal"</string>
-    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optimización en curso para manter a batería en bo estado"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optimizando a preservación da batería"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Batería limitada temporalmente. Toca para obter máis información."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"O teu teléfono utilizouse máis do habitual. A batería pode esgotarse antes do previsto.\n\nAplicacións que máis batería consomen:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"A túa tableta utilizouse máis do habitual. A batería pode esgotarse antes do previsto.\n\nAplicacións que máis batería consomen:"</string>
@@ -3075,10 +3073,15 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Eliminar usuario"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Eliminar"</string>
     <string name="user_guest" msgid="4545590092001460388">"Convidado"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Eliminar invitado"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Queres eliminar o invitado?"</string>
+    <!-- no translation found for user_clear_guest_menu (4864362688187480452) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_menu (5064400453222497734) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_confirm_title (7526978959527761497) -->
+    <skip />
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Eliminaranse todas as aplicacións e datos desta sesión."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Eliminar"</string>
+    <!-- no translation found for user_exit_guest_dialog_remove (8095094235815676847) -->
+    <skip />
     <string name="user_enable_calling" msgid="264875360626905535">"Activar chamadas telefónicas"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Activar chamadas telefónicas e SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Eliminar usuario"</string>
@@ -3099,16 +3102,16 @@
     <string name="nfc_payment_app_and_desc" msgid="2607417639227030398">"<xliff:g id="APP">%1$s</xliff:g> - <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="nfc_payment_use_default" msgid="788899906312142803">"Usar aplicación predeterminada"</string>
     <string name="nfc_payment_favor_default" msgid="4508491832174644772">"Sempre"</string>
-    <string name="nfc_payment_favor_open" msgid="8554643344050373346">"Excepto cando estea aberta outra aplicación de pago"</string>
+    <string name="nfc_payment_favor_open" msgid="8554643344050373346">"Excepto cando estea aberta outra aplicación para pagos"</string>
     <string name="nfc_payment_pay_with" msgid="3001320460566523453">"Nos terminais sen contacto, pagar con:"</string>
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Pago no terminal"</string>
-    <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Configura unha aplicación de pago. A continuación, coloca a parte traseira do teu teléfono sobre calquera terminal que teña o símbolo de pago sen contacto."</string>
+    <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Configura unha aplicación para pagos. A continuación, coloca a parte traseira do teu teléfono sobre calquera terminal que teña o símbolo de pago sen contacto."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Entendido"</string>
     <string name="nfc_more_title" msgid="1041094244767216498">"Máis…"</string>
-    <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Define a aplicación de pagos predeterminada"</string>
-    <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Actualiza a aplicación de pagos predeterminada"</string>
+    <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Define a aplicación para pagos predeterminada"</string>
+    <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Actualiza a aplicación para pagos predeterminada"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Nos terminais sen contacto, pagar con <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="nfc_payment_set_default_instead_of" msgid="565237441045013280">"Nos terminais sen contacto, pagar con <xliff:g id="APP_0">%1$s</xliff:g>.\n\n<xliff:g id="APP_1">%2$s</xliff:g> deixará de ser a túa aplicación de pagos predeterminada."</string>
+    <string name="nfc_payment_set_default_instead_of" msgid="565237441045013280">"Nos terminais sen contacto, pagar con <xliff:g id="APP_0">%1$s</xliff:g>.\n\n<xliff:g id="APP_1">%2$s</xliff:g> deixará de ser a túa aplicación para pagos predeterminada."</string>
     <string name="nfc_payment_btn_text_set_deault" msgid="1821065137209590196">"Definir como predeterminada"</string>
     <string name="nfc_payment_btn_text_update" msgid="5159700960497443832">"Actualizar"</string>
     <string name="restriction_settings_title" msgid="4293731103465972557">"Restricións"</string>
@@ -3233,7 +3236,7 @@
     <string name="connected_devices_dashboard_android_auto_no_driving_mode_summary" msgid="6426996842202276640">"Bluetooth, Android Auto e NFC"</string>
     <string name="connected_devices_dashboard_android_auto_no_nfc_no_driving_mode" msgid="1672426693308438634">"Bluetooth e Android Auto"</string>
     <string name="nfc_and_payment_settings_payment_off_nfc_off_summary" msgid="7132040463607801625">"Non están dispoñibles porque a NFC está desactivada"</string>
-    <string name="nfc_and_payment_settings_no_payment_installed_summary" msgid="4879818114908207465">"Para usar a función, primeiro instala unha aplicación de pago"</string>
+    <string name="nfc_and_payment_settings_no_payment_installed_summary" msgid="4879818114908207465">"Para usar a función, primeiro instala unha aplicación para pagos"</string>
     <string name="app_and_notification_dashboard_title" msgid="2861781687031832943">"Aplicacións e notificacións"</string>
     <string name="app_and_notification_dashboard_summary" msgid="8047683010984186106">"Aplicacións recentes, aplicacións predeterminadas"</string>
     <string name="notification_settings_work_profile" msgid="6076211850526353975">"Non se permite que as aplicacións do perfil de traballo accedan ás notificacións."</string>
@@ -3591,7 +3594,8 @@
     <string name="other_conversations" msgid="551178916855139870">"Conversas non prioritarias"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Conversas que modificases"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Conversas recentes"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Borrar recentes"</string>
+    <!-- no translation found for conversation_settings_clear_recents (4246342656145488662) -->
+    <skip />
     <string name="clear" msgid="5092178335409471100">"Borrar"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Mostrar conversas prioritarias nunha burbulla"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"As conversas prioritarias móstranse na parte superior do panel despregable. Tamén podes configuralas para que se inclúan en burbullas e interrompan o modo Non molestar."</string>
@@ -4424,7 +4428,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Conectado a varios dispositivos"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Modo de demostración da IU do sistema"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Tema escuro"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Activado/Desactivouse temporalmente debido ao Aforro de batería"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Activouse temporalmente debido ao Aforro de batería"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"As aplicacións compatibles tamén cambiarán ao tema escuro"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"De acordo"</string>
@@ -5063,15 +5068,34 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferencias"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Conectarse a redes públicas"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"conexión de rede, Internet, sen fíos, datos, wifi, móbil, operador, 4G, 3G, 2G, LTE"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Ver redes seguras para os avións"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Desactivar modo avión"</string>
+    <!-- no translation found for view_airplane_safe_networks (9170023210981508906) -->
+    <skip />
+    <!-- no translation found for turn_off_airplane_mode (7141986366534514443) -->
+    <skip />
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Conectada"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet non se conectará automaticamente"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Non hai outras redes dispoñibles"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Non hai redes dispoñibles"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Non está dispoñible porque o modo hora de durmir está activado"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Completouse o restablecemento da importancia das notificacións."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Aplicacións"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Un dispositivo non fiable quere acceder ás túas mensaxes. Toca para obter información."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Queres permitir o acceso ás mensaxes?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Un dispositivo Bluetooth non fiable, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], quere acceder ás túas mensaxes.\n\nNunca antes te conectaras a [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Un dispositivo Bluetooth non fiable, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, quere acceder ás túas mensaxes.\n\nNunca antes te conectaras a: <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Un dispositivo non fiable quere acceder aos teus contactos e ao rexistro de chamadas. Toca para obter información."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Queres permitir o acceso aos contactos e ao rexistro de chamadas?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Un dispositivo Bluetooth non fiable, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], quere acceder aos teus contactos e ao rexistro de chamadas, incluídos os datos relacionados coas chamadas entrantes e saíntes.\n\nNunca antes te conectaras a [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Un dispositivo Bluetooth non fiable, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, quere acceder aos teus contactos e ao rexistro de chamadas, incluídos os datos relacionados coas chamadas entrantes e saíntes.\n\nNunca antes te conectaras a: <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
+    <!-- no translation found for category_name_brightness (8520372392029305084) -->
+    <skip />
+    <!-- no translation found for category_name_lock_display (7478785189102882266) -->
+    <skip />
+    <!-- no translation found for category_name_visibility (4485030512199246405) -->
+    <skip />
+    <!-- no translation found for category_name_color (937514550918977151) -->
+    <skip />
+    <!-- no translation found for category_name_others (2366006298768550310) -->
+    <skip />
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index f6fed4e..fb3b0a5 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"સમાપ્તિ સમય"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"સ્થિતિ"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"તીવ્રતા"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"બંધ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"ક્યારેય ઑટોમૅટિક રીતે ચાલુ નહીં થાય"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"<xliff:g id="ID_1">%1$s</xliff:g> વાગ્યે ઑટોમૅટિક રીતે ચાલુ થઈ જશે"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"સૂર્યાસ્ત સમયે ઑટોમૅટિક રીતે ચાલુ થઈ જશે"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"ચાલુ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"ઑટોમૅટિક રીતે ક્યારેય બંધ નહીં થાય"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"<xliff:g id="ID_1">%1$s</xliff:g> વાગ્યે ઑટોમૅટિક રીતે બંધ થઈ જશે"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"સૂર્યોદય સમયે ઑટોમૅટિક રીતે બંધ થઈ જશે"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"સૂર્યાસ્તથી સૂર્યોદય સુધી ચાલુ"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"કસ્ટમ સમયે ચાલુ થાય છે"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"સ્ટેટસ"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"બંધ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"ક્યારેય ઑટોમૅટિક રીતે ચાલુ નહીં થાય"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"સૂર્યાસ્ત સમયે ઑટોમૅટિક રીતે ચાલુ થઈ જશે"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"<xliff:g id="ID_1">%1$s</xliff:g> વાગ્યે ઑટોમૅટિક રીતે ચાલુ થઈ જશે"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"ચાલુ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"ક્યારેય ઑટોમૅટિક રીતે બંધ નહીં થાય"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"સૂર્યોદય સમયે ઑટોમૅટિક રીતે બંધ થઈ જશે"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"<xliff:g id="ID_1">%1$s</xliff:g> વાગ્યે ઑટોમૅટિક રીતે બંધ થઈ જશે"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"સ્ક્રીન રીડર"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ઑડિઓ અને સ્ક્રીન પરની ટેક્સ્ટ"</string>
     <string name="display_category_title" msgid="6638191682294461408">"ડિસ્પ્લે"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"ક્રિયાપ્રતિક્રિયાના નિયંત્રણો"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"ડાઉનલોડ કરેલી ઍપ"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"પ્રાયોગિક"</string>
@@ -3075,10 +3073,15 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"વપરાશકર્તા કાઢી નાંખો"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"ડિલીટ કરો"</string>
     <string name="user_guest" msgid="4545590092001460388">"અતિથિ"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"અતિથિ દૂર કરો"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"અતિથિ દૂર કરીએ?"</string>
+    <!-- no translation found for user_clear_guest_menu (4864362688187480452) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_menu (5064400453222497734) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_confirm_title (7526978959527761497) -->
+    <skip />
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"આ સત્રમાંની તમામ ઍપ્લિકેશનો અને ડેટા કાઢી નાખવામાં આવશે."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"દૂર કરો"</string>
+    <!-- no translation found for user_exit_guest_dialog_remove (8095094235815676847) -->
+    <skip />
     <string name="user_enable_calling" msgid="264875360626905535">"ફોન કૉલ ચાલુ કરો"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"ફોન કૉલ અને SMS ચાલુ કરો"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"વપરાશકર્તાને ડિલીટ કરો"</string>
@@ -3591,7 +3594,8 @@
     <string name="other_conversations" msgid="551178916855139870">"ગૌણ વાતચીતો"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"તમે જેમાં ફેરફારો કર્યા છે તેવી વાતચીતો"</string>
     <string name="recent_conversations" msgid="471678228756995274">"તાજેતરની વાતચીતો"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"હાલની વાતચીતો સાફ કરો"</string>
+    <!-- no translation found for conversation_settings_clear_recents (4246342656145488662) -->
+    <skip />
     <string name="clear" msgid="5092178335409471100">"સાફ કરો"</string>
     <string name="important_bubble" msgid="7911698275408390846">"પ્રાધાન્યતા ધરાવતી વાતચીતો માટે બબલ બતાવો"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"પ્રાધાન્યતા ધરાવતી વાતચીતો નોટિફિકેશન શેડની ટોચ પર બતાવવામાં આવે છે. તમે તેને બબલ બતાવવા અને \'ખલેલ પાડશો નહીં\'ને વિક્ષેપિત કરવા માટે સેટ કરી શકો છો."</string>
@@ -4424,7 +4428,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"બહુવિધ ઉપકરણો સાથે કનેક્ટ કરેલું છે"</string>
     <string name="demo_mode" msgid="6566167465451386728">"સિસ્ટમ UI ડેમો મોડ"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"ઘેરી થીમ"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"ચાલુ / બૅટરી સેવરને કારણે હંગામીરૂપે બંધ કરવામાં આવ્યું છે"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"બૅટરી સેવરને કારણે હંગામીરૂપે ચાલુ કરવામાં આવ્યું છે"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"સમર્થિત ઍપમાં પણ બદલાઈને ઘેરી થીમ થશે"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"સમજાઈ ગયું"</string>
@@ -5063,15 +5068,34 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"પસંદગીઓ"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"સાર્વજનિક નેટવર્ક સાથે કનેક્ટ કરો"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"નેટવર્ક કનેક્શન, ઇન્ટરનેટ, વાયરલેસ, ડેટા, વાઇ-ફાઇ, સેલ્યુલર, મોબાઇલ, સેલ, મોબાઇલ ઑપરેટર, 4G, 3G, 2G, LTE"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"એરપ્લેન મોડમાં ઉપયોગ માટે સુરક્ષિત નેટવર્ક જુઓ"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"એરપ્લેન મોડ બંધ કરો"</string>
+    <!-- no translation found for view_airplane_safe_networks (9170023210981508906) -->
+    <skip />
+    <!-- no translation found for turn_off_airplane_mode (7141986366534514443) -->
+    <skip />
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"કનેક્ટ કરેલું"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"ઇન્ટરનેટ ઑટોમૅટિક રીતે કનેક્ટ થશે નહીં"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"બીજાં કોઈ નેટવર્ક ઉપલબ્ધ નથી"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"કોઈ નેટવર્ક ઉપલબ્ધ નથી"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"ઉપલબ્ધ નથી કારણ કે બેડટાઇમ મોડ ચાલુ છે"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"નોટિફિકેશનનું મહત્ત્વ રીસેટ કરવાની પ્રક્રિયા પૂર્ણ થઈ."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"ઍપ"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"અવિશ્વસનીય ડિવાઇસ તમારા સંદેશા ઍક્સેસ કરવા માગે છે. વિગતો માટે ટૅપ કરો."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"સંદેશા ઍક્સેસ કરવાની મંજૂરી આપીએ?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"અવિશ્વસનીય બ્લૂટૂથ ડિવાઇસ, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], તમારા સંદેશા ઍક્સેસ કરવા માગે છે.\n\nતમે પહેલાં ક્યારેય [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] સાથે કનેક્ટ થયા નથી."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"અવિશ્વસનીય બ્લૂટૂથ ડિવાઇસ, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, તમારા સંદેશા ઍક્સેસ કરવા માગે છે.\n\nતમે પહેલાં ક્યારેય <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> સાથે કનેક્ટ થયા નથી."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"અવિશ્વસનીય ડિવાઇસ તમારા સંપર્કો અને કૉલ લૉગ ઍક્સેસ કરવા માગે છે. વિગતો માટે ટૅપ કરો."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"સંપર્કો અને કૉલ લૉગ ઍક્સેસ કરવાની મંજૂરી આપીએ?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"અવિશ્વસનીય બ્લૂટૂથ ડિવાઇસ, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], તમારા સંપર્કો અને કૉલ લૉગ ઍક્સેસ કરવા માગે છે. આમાં ઇનકમિંગ અને આઉટગોઇંગ કૉલ વિશેનો ડેટા શામેલ છે.\n\nતમે પહેલાં ક્યારેય [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] સાથે કનેક્ટ થયા નથી."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"અવિશ્વસનીય બ્લૂટૂથ ડિવાઇસ, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, તમારા સંપર્કો અને કૉલ લૉગ ઍક્સેસ કરવા માગે છે. આમાં ઇનકમિંગ અને આઉટગોઇંગ કૉલ વિશેનો ડેટા શામેલ છે.\n\nતમે પહેલાં ક્યારેય <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> સાથે કનેક્ટ થયા નથી."</string>
+    <!-- no translation found for category_name_brightness (8520372392029305084) -->
+    <skip />
+    <!-- no translation found for category_name_lock_display (7478785189102882266) -->
+    <skip />
+    <!-- no translation found for category_name_visibility (4485030512199246405) -->
+    <skip />
+    <!-- no translation found for category_name_color (937514550918977151) -->
+    <skip />
+    <!-- no translation found for category_name_others (2366006298768550310) -->
+    <skip />
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index aca9822..73c4ee8 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"खत्म होने का समय"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"स्थिति"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"तीव्रता"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"बंद / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"कभी भी अपने-आप चालू नहीं होगी"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"<xliff:g id="ID_1">%1$s</xliff:g> बजे अपने आप चालू हो जाएगा"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"सूर्यास्त होने पर अपने आप चालू हो जाएगा"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"चालू / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"कभी भी अपने आप बंद नहीं होगा"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"<xliff:g id="ID_1">%1$s</xliff:g> बजे अपने आप बंद हो जाएगा"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"सूर्योदय होने पर अपने आप बंद हो जाएगा"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"सूर्योदय से सूर्यास्त तक चालू रहती है"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"अपने मुताबिक तय समय पर चालू करें"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"स्थिति"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"बंद है / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"कभी भी अपने-आप चालू नहीं होगी"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"शाम होने पर अपने-आप चालू हो जाएगा"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"<xliff:g id="ID_1">%1$s</xliff:g> पर अपने-आप चालू हो जाएगा"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"चालू है / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"कभी भी अपने-आप बंद नहीं होगा"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"सुबह होने पर अपने-आप बंद हो जाएगा"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"<xliff:g id="ID_1">%1$s</xliff:g> पर अपने-आप बंद हो जाएगा"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"स्क्रीन रीडर"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ऑडियो और ऑन-स्क्रीन लेख"</string>
     <string name="display_category_title" msgid="6638191682294461408">"डिसप्ले"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"इंटरैक्शन कंट्रोल"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"डाउनलोड किए गए ऐप्लिकेशन"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"प्रयोग के लिए"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"उपयोगकर्ता मिटाएं"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"मिटाएं"</string>
     <string name="user_guest" msgid="4545590092001460388">"मेहमान"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"अतिथि को निकालें"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"अतिथि को निकालें?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"मेहमान मोड से एग्ज़िट करें"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"मेहमान के तौर पर ब्राउज़ करने का सेशन खत्म करें"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"मेहमान के तौर पर ब्राउज़ करने का सेशन खत्म करना चाहते हैं?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"इस सत्र के सभी ऐप्लिकेशन और डेटा को हटा दिया जाएगा."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"निकालें"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"सेशन खत्म करें"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"फ़ोन कॉल की सुविधा चालू करें"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"फ़ोन कॉल और मैसेज (एसएमएस) चालू करें"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"उपयोगकर्ता को हटाना"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"अन्य बातचीत"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"आपने जिन बातचीत में बदलाव किए हैं"</string>
     <string name="recent_conversations" msgid="471678228756995274">"हाल ही में की गई बातचीत"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"हाल की बातचीत मिटाएं"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"हाल की सभी गतिविधियां मिटाएं"</string>
     <string name="clear" msgid="5092178335409471100">"मिटाएं"</string>
     <string name="important_bubble" msgid="7911698275408390846">"अहम बातचीत को बबल करें"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"अहम बातचीत, पुल-डाउन शेड में सबसे ऊपर दिखती हैं. आप इन्हें बबल पर भी सेट कर सकते हैं और \'परेशान न करें\' मोड को रोक सकते हैं."</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"कई डिवाइस से कनेक्ट है"</string>
     <string name="demo_mode" msgid="6566167465451386728">"सिस्टम यूज़र इंटरफ़ेस (यूआई) डेमो मोड"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"गहरे रंग वाली थीम"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"चालू है / \'बैटरी सेवर\' की वजह से कुछ समय के लिए बंद है"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"\'बैटरी सेवर\' की वजह से कुछ समय के लिए चालू है"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"ऐप्लिकेशन भी गहरे रंग की थीम में बदल जाएंगे"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"ठीक है"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"प्राथमिकताएं"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"सार्वजनिक नेटवर्क से कनेक्ट करें"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"नेटवर्क कनेक्शन, इंटरनेट, वायरलेस, डेटा, वाईफ़ाई, सेल्युलर, मोबाइल, मोबाइल और इंटरनेट सेवा देने वाली कंपनी, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"हवाई जहाज़ सुरक्षित नेटवर्क देखें"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"हवाई जहाज़ मोड बंद करें"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"हवाई जहाज़ मोड वाले नेटवर्क देखें"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"हवाई जहाज़ मोड बंद करें"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"कनेक्ट हो गया"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"इंटरनेट अपने-आप कनेक्ट नहीं होगा"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"कोई दूसरा नेटवर्क उपलब्ध नहीं है"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"कोई नेटवर्क उपलब्ध नहीं है"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"बेडटाइम मोड चालू होने पर यह सुविधा काम नहीं करती है"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"सूचनाओं की प्राथमिकता को रीसेट करने की प्रक्रिया पूरी हुई."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"ऐप्लिकेशन"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"एक डिवाइस आपके मैसेज ऐक्सेस करना चाहता है, लेकिन इस डिवाइस पर भरोसा नहीं किया जा सकता. जानकारी के लिए टैप करें."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"क्या आप मैसेज का ऐक्सेस देना चाहते हैं?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"एक ब्लूटूथ डिवाइस, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], आपके मैसेज ऐक्सेस करना चाहता है, लेकिन इस डिवाइस पर भरोसा नहीं किया जा सकता.\n\nआपने इसे पहले कभी [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] से कनेक्ट नहीं किया है."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"एक ब्लूटूथ डिवाइस, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> आपके मैसेज ऐक्सेस करना चाहता है, लेकिन इस डिवाइस पर भरोसा नहीं किया जा सकता.\n\nआपने पहले कभी अपने <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> को इससे कनेक्ट नहीं किया है."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"एक डिवाइस, आपके संपर्क और कॉल लॉग ऐक्सेस करना चाहता है. जानकारी के लिए टैप करें."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"क्या आप अपने संपर्क और कॉल लॉग का ऐक्सेस देना चाहते हैं?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"एक ब्लूटूथ डिवाइस, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], आपके संपर्क और कॉल लॉग ऐक्सेस करना चाहता है, लेकिन इस डिवाइस पर भरोसा नहीं किया जा सकता. इसमें आपके किए गए कॉल (आउटगोइंग) और आने वाले कॉल (इनकमिंग) से जुड़ा डेटा भी शामिल है.\n\nआपने पहले कभी अपने [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] को इससे कनेक्ट नहीं किया है."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"एक ब्लूटूथ डिवाइस, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> आपके संपर्क और कॉल लॉग ऐक्सेस करना चाहता है, लेकिन इस डिवाइस पर भरोसा नहीं किया जा सकता. इसमें आपके किए गए कॉल (आउटगोइंग) और आने वाले कॉल (इनकमिंग) से जुड़ा डेटा भी शामिल है.\n\nआपने पहले कभी अपने <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> को इससे कनेक्ट नहीं किया है."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"चमक"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"लॉक स्क्रीन का डिसप्ले"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"किसको दिखाई दे"</string>
+    <string name="category_name_color" msgid="937514550918977151">"रंग"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"अन्य"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 2f4fddc..d5d00ef 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -1249,11 +1249,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Vrijeme završetka"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Status"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intenzitet"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Isključeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Nikad se ne uključuje automatski"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Uključuje se automatski u <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Uključuje se automatski kad sunce zađe"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Uključeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Nikad se ne isključuje automatski"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Isključuje se automatski u <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Isključuje se automatski kad sunce izađe"</string>
@@ -1276,11 +1274,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Od zalaska do izlaska sunca"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Uključi u prilagođeno vrijeme"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Status"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Isključeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Nikad se ne uključuje automatski"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Uključuje se automatski kad sunce zađe"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Uključuje se automatski u <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Uključeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Nikad se ne isključuje automatski"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Isključuje se automatski kad sunce izađe"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Isključuje se automatski u <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2160,6 +2156,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Čitači zaslona"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Zvuk i tekst na zaslonu"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Zaslon"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Kontrole interakcije"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Preuzete aplikacije"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Eksperimentalno"</string>
@@ -3118,10 +3116,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Izbriši korisnika"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Izbriši"</string>
     <string name="user_guest" msgid="4545590092001460388">"Gost"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Uklanjanje gosta"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Ukloniti gosta?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Izbriši podatke o gostu"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Završi gostujuću sesiju"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Završiti gostujuću sesiju?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Sve aplikacije i podaci u ovoj sesiji bit će izbrisani."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Ukloni"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Završi sesiju"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Uključivanje telefonskih poziva"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Uključivanje telefonskih poziva i SMS-a"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Brisanje korisnika"</string>
@@ -3636,7 +3635,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Razgovori koji nisu prioritetni"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Razgovori koje ste izmijenili"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Nedavni razgovori"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Izbriši nedavne"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Izbriši sve nedavno"</string>
     <string name="clear" msgid="5092178335409471100">"Izbriši"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Prikaži prioritetne razgovore u oblačićima"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Prioritetni razgovori prikazuju se pri vrhu zaslona obavijesti. Možete postaviti i da se prikazuju u oblačićima te vas ometaju dok je uključena značajka Ne uznemiravaj."</string>
@@ -4494,7 +4493,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Povezano s više uređaja"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Demo način korisničkog sučelja sustava"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Tamna tema"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Uključeno/trenutačno onemogućeno zbog Štednje baterije"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Trenutačno uključeno zbog Štednje baterije"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Podržane aplikacije također će prijeći na tamnu temu"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Shvaćam"</string>
@@ -5146,15 +5146,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Postavke"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Poveži se s javnim mrežama"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"mrežna veza, internet, bežično, podaci, wifi, wi-fi, wi fi, mobilno, mobilni uređaj, mobilni operater, 4 g, 3 g, 2 g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Pregled mreža sigurnih za rad u zrakopl."</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Isključite način rada u zrakoplovu"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Pregled mreža sigurnih za rad u zrakopl."</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Isključi način rada u zrakoplovu"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Povezano"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Neće biti automatskog povezivanja s internetom"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Nije dostupna nijedna druga mreža"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Nema dostupnih mreža"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Nije dostupno jer je uključen način rada u vrijeme spavanja"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Dovršeno je vraćanje važnosti obavijesti na zadano."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Aplikacije"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Nepouzdani uređaj želi pristupiti vašim porukama. Dodirnite da biste vidjeli pojedinosti."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Dopustiti pristup porukama?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Nepouzdani Bluetooth uređaj [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] želi pristupiti vašim porukama.\n\nDo sad se niste povezali s uređajem [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Nepouzdani Bluetooth uređaj <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> želi pristupiti vašim porukama.\n\nDo sad se niste povezali s uređajem <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Nepouzdani uređaj želi pristupiti vašim kontaktima i zapisniku poziva. Dodirnite da biste vidjeli pojedinosti."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Dopustiti pristup kontaktima i zapisniku poziva?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Nepouzdani Bluetooth uređaj [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] želi pristupiti vašim kontaktima i zapisniku poziva. To uključuje podatke o dolaznim i odlaznim pozivima.\n\nDo sad se niste povezali s uređajem [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Nepouzdani Bluetooth uređaj <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> želi pristupiti vašim kontaktima i zapisniku poziva. To uključuje podatke o dolaznim i odlaznim pozivima.\n\nDo sad se niste povezali s uređajem <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Svjetlina"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Zaključani zaslon"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Vidljivost"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Boja"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Ostalo"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index fdd2ced..ce8e1b5 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Befejezés ideje"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Állapot"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intenzitás"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Ki / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Soha nem kapcsol be automatikusan"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Automatikusan bekapcsol a következő időpontban: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Automatikusan bekapcsol napnyugtakor"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Be (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Soha nem kapcsol ki automatikusan"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Automatikusan kikapcsol a következő időpontban: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Automatikusan kikapcsol napkeltekor"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Napnyugtától napkeltéig"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Adott időpontban kapcsol be"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Állapot"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Ki / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Soha nem kapcsol be automatikusan"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Automatikusan bekapcsol napnyugtakor"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Automatikusan bekapcsol a következő időpontban: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Be / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Soha nem kapcsol ki automatikusan"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Automatikusan kikapcsol napkeltekor"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Automatikusan kikapcsol a következő időpontban: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Képernyőolvasók"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Hang és képernyőn megjelenő szöveg"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Megjelenítés"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Interakcióvezérlők"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Letöltött alkalmazások"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Kísérleti"</string>
@@ -3075,10 +3073,15 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Felhasználó törlése"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Törlés"</string>
     <string name="user_guest" msgid="4545590092001460388">"Vendég"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Vendég munkamenet eltávolítása"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Eltávolítja a vendég munkamenetet?"</string>
+    <!-- no translation found for user_clear_guest_menu (4864362688187480452) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_menu (5064400453222497734) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_confirm_title (7526978959527761497) -->
+    <skip />
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"A munkamenetben található összes alkalmazás és adat törlődni fog."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Eltávolítás"</string>
+    <!-- no translation found for user_exit_guest_dialog_remove (8095094235815676847) -->
+    <skip />
     <string name="user_enable_calling" msgid="264875360626905535">"Hívások engedélyezése"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Hívások és SMS-ek engedélyezése"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Felhasználó törlése"</string>
@@ -3591,7 +3594,8 @@
     <string name="other_conversations" msgid="551178916855139870">"Kevésbé fontos beszélgetések"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Azok a beszélgetések, amelyeket módosított"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Legutóbbi beszélgetések"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Legutóbbiak törlése"</string>
+    <!-- no translation found for conversation_settings_clear_recents (4246342656145488662) -->
+    <skip />
     <string name="clear" msgid="5092178335409471100">"Törlés"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Elsődleges beszélgetések buborékba helyezése"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Az elsődleges beszélgetések a lehúzható értesítési felület tetején vannak. Beállíthatja azt is, hogy buborékban jelenjenek meg, és hogy a Ne zavarjanak beállítás mellett is láthatók legyenek."</string>
@@ -4424,7 +4428,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Több eszközhöz csatlakozik"</string>
     <string name="demo_mode" msgid="6566167465451386728">"A rendszer kezelőfelületének demómódja"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Sötét téma"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Be/Átmenetileg kikapcsolva az Akkumulátorkímélő mód miatt"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Átmenetileg bekapcsolva az Akkumulátorkímélő mód miatt"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"A támogatott alkalmazások témája is sötét lesz"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Értem"</string>
@@ -5063,15 +5068,34 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Beállítások"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Csatlakozás nyilvános hálózatokhoz"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"hálózati kapcsolat, internet, vezeték nélküli, mobiladat, adat, wifi, wi-fi, mobil, mobiltelefon, szolgáltató, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Repülőn használható hálózatok mutatása"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Repülős üzemmód kikapcsolása"</string>
+    <!-- no translation found for view_airplane_safe_networks (9170023210981508906) -->
+    <skip />
+    <!-- no translation found for turn_off_airplane_mode (7141986366534514443) -->
+    <skip />
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> (<xliff:g id="NETWORKMODE">%2$s</xliff:g>)"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Csatlakozva"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Az internetre történő csatlakozás nem automatikus"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Nincs több rendelkezésre álló hálózat"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Nincs rendelkezésre álló hálózat"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Nem áll rendelkezésre, mert be van kapcsolva az alvásidő mód"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Értesítés fontosságának visszaállítása befejezve."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Alkalmazások"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Egy nem megbízható eszköz hozzá szeretne férni az Ön üzeneteihez. Koppintson a részletekért."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Engedélyezi az üzenetekhez való hozzáférést?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Egy nem megbízható Bluetooth-eszköz ([<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]) hozzá szeretne férni az Ön üzeneteihez.\n\nEddig még nem csatlakozott a következő eszközhöz: [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Egy nem megbízható Bluetooth-eszköz (<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>) hozzá szeretne férni az Ön üzeneteihez.\n\nEddig még nem csatlakozott a következő eszközhöz: <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Egy nem megbízható eszköz hozzá szeretne férni az Ön névjegyeihez és hívásnaplójához. Koppintson a részletekért."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Engedélyezi a névjegyeihez és a hívásnaplójához való hozzáférést?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Egy nem megbízható Bluetooth-eszköz ([<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]) hozzá szeretne férni az Ön névjegyeihez és hívásnaplójához. Ide tartoznak a bejövő és kimenő hívások adatai is.\n\nEddig még nem csatlakozott a következő eszközhöz: [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Egy nem megbízható Bluetooth-eszköz (<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>) hozzá szeretne férni az Ön névjegyeihez és hívásnaplójához. Ide tartoznak a bejövő és kimenő hívások adatai is.\n\nEddig még nem csatlakozott a következő eszközhöz: <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
+    <!-- no translation found for category_name_brightness (8520372392029305084) -->
+    <skip />
+    <!-- no translation found for category_name_lock_display (7478785189102882266) -->
+    <skip />
+    <!-- no translation found for category_name_visibility (4485030512199246405) -->
+    <skip />
+    <!-- no translation found for category_name_color (937514550918977151) -->
+    <skip />
+    <!-- no translation found for category_name_others (2366006298768550310) -->
+    <skip />
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index de8669c..4bab110 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Ավարտ"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Կարգավիճակ"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Ինտենսիվություն"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Անջատված է / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Ավտոմատ չի միանա"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Ավտոմատ կմիանա <xliff:g id="ID_1">%1$s</xliff:g>-ին"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Ավտոմատ կմիանա մայրամուտին"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Միացված է / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Ավտոմատ չի անջատվի"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Ավտոմատ կանջատվի <xliff:g id="ID_1">%1$s</xliff:g>-ին"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Ավտոմատ կանջատվի արևածագին"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Միանում է մայրամուտից լուսաբաց"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Միանում է սահմանված ժամին"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Կարգավիճակ"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Անջատված է / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Ավտոմատ չի միանա"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Ավտոմատ կմիանա մայրամուտին"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Ավտոմատ կմիանա <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Միացված է/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Ավտոմատ չի անջատվի"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Ավտոմատ կանջատվի արևածագին"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Ավտոմատ կանջատվի <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Էկրանի ընթերցիչներ"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Աուդիո և էկրանի տեքստ"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Էկրան"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Կառավարման տարրեր"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Ներբեռնված հավելվածներ"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Փորձնական"</string>
@@ -2456,8 +2454,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Պլանշետը սովորականից շատ է էներգիա օգտագործել"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Սարքը սովորականից շատ է էներգիա օգտագործել"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Մարտկոցի լիցքը կարող է սովորականից շուտ սպառվել"</string>
-    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Օպտիմալացում՝ մարտկոցի ծառայության ժամկետը երկարացնելու համար"</string>
-    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Մարտկոցը ժամանակավորապես սահմանափակված է։ Հպեք՝ ավելին իմանալու համար։"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Օպտիմալացում մարտկոցի պահպանման համար"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Մարտկոցի լիցքը ժամանակավորապես սահմանափակված է։ Հպեք՝ ավելին իմանալու համար։"</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Ձեր հեռախոսը սովորականից շատ է էներգիա օգտագործել։ Մարտկոցի լիցքը կարող է սպասվածից շուտ սպառվել։\n\nԱմենից շատ էներգիա սպառող հավելվածներն են՝"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Ձեր պլանշետը սովորականից շատ է էներգիա օգտագործել։ Մարտկոցի լիցքը կարող է սպասվածից շուտ սպառվել։\n\nԱմենից շատ էներգիա սպառող հավելվածներն են՝"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Ձեր սարքը սովորականից շատ է էներգիա օգտագործել։ Մարտկոցի լիցքը կարող է սպասվածից շուտ սպառվել։\n\nԱմենից շատ էներգիա սպառող հավելվածներն են՝"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Ջնջել օգտատիրոջը"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Ջնջել"</string>
     <string name="user_guest" msgid="4545590092001460388">"Հյուր"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Հեռացնել հյուրին"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Հեռացնե՞լ հյուրին:"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Մաքրել հյուրի տվյալները"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Ավարտել հյուրի աշխատաշրջանը"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Ավարտե՞լ հյուրի աշխատաշրջանը"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Այս աշխատաշրջանի բոլոր ծրագրերն ու տվյալները կջնջվեն:"</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Հեռացնել"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Ավարտել աշխատաշրջանը"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Միացնել հեռախոսազանգերը"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Միացնել զանգերն ու SMS-ները"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Ջնջել օգտատիրոջը"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Ոչ առաջնահերթ զրույցները"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Զրույցներ, որոնցում փոփոխություններ եք կատարել"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Վերջին զրույցները"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Ջնջել վերջինները"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Մաքրել վերջինները"</string>
     <string name="clear" msgid="5092178335409471100">"Մաքրել"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Ցույց տալ կարևոր խոսակցություններն ամպիկներում"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Կարևոր զրույցները ցուցադրվում են իջնող վահանակի վերևում։ Դուք կարող եք կարգավորել այնպես, որ դրանք ցուցադրվեն ամպիկի տեսքով և դադարեցնեն «Չանհանգստացնել» ռեժիմը։"</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Միացված է բազմակի շարժական սարքերի"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Համակարգի միջերեսի ցուցադրական ռեժիմ"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Մուգ թեմա"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Միացնել (անջատվել է մարտկոցի տնտեսման համար)"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Ժամանակավորապես միացվել է մարտկոցի տնտեսման համար"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Աջակցվող հավելվածները ևս կանցնեն մուգ թեմային"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Եղավ"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Կարգավորումներ"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Միանալ հանրային ցանցերին"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"կապ, համացանց, անլար, ինտերնետ, wifi, wi-fi, wi fi, բջջային, շարժական, բջջային օպերատոր, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Ցանցեր, որոնք անվտանգ են ինքնաթիռում"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Անջատել ավիառեժիմը"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Ցանցեր, որոնք անվտանգ են ինքնաթիռում"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Անջատել ավիառեժիմը"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Միացած է"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Չհաջողվեց ավտոմատ միանալ համացանցին"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Այլ հասանելի ցանցեր չկան"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Հասանելի ցանցեր չկան"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Անհասանելի է, քանի որ քնի ռեժիմը միացված է"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Ծանուցումների կարևորության կարգավորումները զրոյացվեցին։"</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Հավելվածներ"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Մի ոչ վստահելի սարք ուզում է հասանելիություն ստանալ ձեր հաղորդագրություններին։ Հպեք՝ ավելին իմանալու համար։"</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Հասանելի դարձնե՞լ հաղորդագրությունները"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"[<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] սարքը, որը ոչ վստահելի Bluetooth սարք է, ուզում է հասանելիություն ստանալ ձեր հաղորդագրություններին։\n\nԴուք նախկինում չեք միացել [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] սարքին։"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> սարքը, որը ոչ վստահելի Bluetooth սարք է, ուզում է հասանելիություն ստանալ ձեր հաղորդագրություններին։\n\nԴուք նախկինում չեք միացել <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> սարքին։"</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Մի ոչ վստահելի սարք ուզում է հասանելիություն ստանալ ձեր կոնտակտներին և զանգերի մատյանին։ Հպեք՝ ավելին իմանալու համար։"</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Հասանելի դարձնե՞լ կոնտակտներն ու զանգերի մատյանը"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"[<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] սարքը, որը ոչ վստահելի Bluetooth սարք է, ուզում է հասանելիություն ստանալ ձեր կոնտակտներին և զանգերի մատյանին, որը ներառում է մուտքային և ելքային զանգերի մասին տվյալներ։\n\nԴուք նախկինում չեք միացել [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] սարքին։"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> սարքը, որը ոչ վստահելի Bluetooth սարք է, ուզում է հասանելիություն ստանալ ձեր կոնտակտներին և զանգերի մատյանին, որը ներառում է մուտքային և ելքային զանգերի մասին տվյալներ։\n\nԴուք նախկինում չեք միացել <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> սարքին։"</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Պայծառություն"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Կողպէկրան"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Տեսանելիություն"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Գույն"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Այլ"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 27e096e..3dfe0d7 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Waktu selesai"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Status"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intensitas"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Nonaktif / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Tidak akan aktif otomatis"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Akan aktif otomatis pada <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Akan aktif otomatis saat matahari terbenam"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Aktif / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Tidak akan nonaktif otomatis"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Akan nonaktif otomatis pukul <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Akan nonaktif otomatis saat matahari terbit"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Aktifkan dari malam hingga pagi"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Aktifkan pada waktu khusus"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Status"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Nonaktif / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Tidak akan aktif otomatis"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Akan aktif otomatis saat malam"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Akan aktif otomatis pada <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Aktif / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Tidak akan nonaktif otomatis"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Akan nonaktif otomatis saat pagi"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Akan nonaktif otomatis pukul <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Pembaca layar"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio &amp; teks di layar"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Tampilan"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Kontrol interaksi"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Aplikasi yang didownload"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Eksperimental"</string>
@@ -2457,7 +2455,7 @@
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Perangkat digunakan lebih lama dari biasanya"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Baterai mungkin lebih cepat habis daripada biasanya"</string>
     <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Mengoptimalkan untuk kesehatan baterai"</string>
-    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Daya baterai terbatas untuk sementara. Ketuk untuk mempelajari lebih lanjut."</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Daya baterai sementara dibatasi. Ketuk untuk mempelajari lebih lanjut."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Ponsel dipakai lebih lama dari biasanya. Baterai mungkin lebih cepat habis dari perkiraan.\n\nAplikasi yang paling banyak menggunakan baterai:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Tablet digunakan lebih sering dari biasanya. Baterai mungkin lebih cepat habis dari yang diperkirakan.\n\nAplikasi yang paling banyak menggunakan baterai:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Perangkat Anda digunakan lebih sering dari biasanya. Baterai mungkin lebih cepat habis dari yang diperkirakan.\n\nAplikasi yang paling banyak menggunakan baterai:"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Hapus pengguna"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Hapus"</string>
     <string name="user_guest" msgid="4545590092001460388">"Tamu"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Hapus tamu"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Hapus tamu?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Hapus data tamu"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Akhiri sesi tamu"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Akhiri sesi tamu?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Semua aplikasi dan data di sesi ini akan dihapus."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Hapus"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Akhiri sesi"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Aktifkan panggilan telepon"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Aktifkan panggilan telepon &amp; SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Hapus pengguna"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Percakapan non-prioritas"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Percakapan yang telah Anda ubah"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Percakapan terbaru"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Hapus yang terbaru"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Hapus semua yang baru"</string>
     <string name="clear" msgid="5092178335409471100">"Hapus"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Tampilkan balon percakapan prioritas"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Percakapan prioritas muncul di bagian atas menu notifikasi. Anda juga dapat menyetelnya untuk menampilkan balon dan mengganggu fitur Jangan Ganggu."</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Terhubung ke beberapa perangkat"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Mode demo UI sistem"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Tema gelap"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Aktif / Dinonaktifkan sementara karena fitur Penghemat Baterai"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Diaktifkan sementara karena fitur Penghemat Baterai"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Aplikasi yang didukung juga akan beralih ke tema gelap"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Oke"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferensi"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Hubungkan ke jaringan publik"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"koneksi jaringan, internet, nirkabel, data, wifi, wi-fi, wi fi, seluler, (perangkat) seluler, operator seluler, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Tampilkan jaringan aman di pesawat"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Nonaktifkan Mode Pesawat"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Tampilkan jaringan mode pesawat"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Nonaktifkan mode pesawat"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Terhubung"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet tidak akan terhubung secara otomatis"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Jaringan lain tidak tersedia"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Jaringan tidak tersedia"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Tidak tersedia karena mode waktu tidur diaktifkan"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Reset nilai penting notifikasi selesai."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Aplikasi"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Perangkat tidak tepercaya ingin mengakses pesan Anda. Ketuk untuk melihat detailnya."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Izinkan akses ke pesan?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Perangkat Bluetooth yang tidak tepercaya, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ingin mengakses pesan Anda.\n\nAnda belum pernah terhubung ke [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] sebelumnya."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Perangkat Bluetooth yang tidak dipercaya, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, ingin mengakses pesan Anda.\n\nAnda belum pernah terhubung ke <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> sebelumnya."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Perangkat yang tidak tepercaya ingin mengakses kontak dan log panggilan Anda. Ketuk untuk melihat detailnya."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Izinkan akses ke kontak dan log panggilan?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Perangkat Bluetooth yang tidak tepercaya, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ingin mengakses kontak dan log panggilan Anda. Ini mencakup data tentang panggilan masuk dan keluar.\n\nAnda belum pernah terhubung ke [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] sebelumnya."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Perangkat Bluetooth yang tidak tepercaya, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, ingin mengakses kontak dan log panggilan Anda. Ini mencakup data tentang panggilan masuk dan keluar.\n\nAnda belum pernah terhubung ke <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> sebelumnya."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Kecerahan"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Kunci Tampilan"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Visibilitas"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Warna"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Lainnya"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index ba88954..075678f 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Lokatími"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Staða"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Styrkur"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Slökkt / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Kveikir aldrei sjálfkrafa"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Kveikir sjálfkrafa kl. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Kveikir sjálfkrafa við sólsetur"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Kveikt / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Slekkur aldrei sjálfkrafa"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Slekkur sjálfkrafa kl. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Slekkur sjálfkrafa við sólarupprás"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Frá sólsetri til sólarupprásar"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Kveikt á tilgreindum tíma"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Staða"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Slökkt / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Kveikir aldrei sjálfkrafa"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Kveikir sjálfkrafa við sólsetur"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Kveikt sjálfkrafa kl. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Kveikt / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Slekkur aldrei sjálfkrafa"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Slokknar sjálfkrafa við sólarupprás"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Slökkt sjálfkrafa kl. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Skjálesarar"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Hljóð og skjátexti"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Skjár"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Gagnvirknistýringar"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Sótt forrit"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Tilraunastillingar"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Eyða notanda"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Eyða"</string>
     <string name="user_guest" msgid="4545590092001460388">"Gestur"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Fjarlægja gest"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Fjarlægja gest?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Hreinsa gestagögn"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Ljúka gestalotu"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Ljúka gestalotu?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Öllum forritum og gögnum í þessari lotu verður eytt."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Fjarlægja"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Ljúka lotu"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Kveikja á símtölum"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Kveikja á símtölum og SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Eyða notanda"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Samtöl sem eru ekki í forgangi"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Samtöl sem þú hefur gert breytingar á"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Nýleg samtöl"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Hreinsa nýlegt"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Hreinsa allt nýlegt"</string>
     <string name="clear" msgid="5092178335409471100">"Hreinsa"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Forgangssamtöl í blöðrum"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Forgangssamtöl birtast efst á tilkynningasvæðinu. Þú getur einnig stillt þau á að birtast í blöðru og trufla þannig „Ónáðið ekki“."</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Tengt við mörg tæki"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Prufustilling kerfisviðmóts"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Dökkt þema"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Kveikt / Óvirkt tímabundið vegna rafhlöðusparnaðar"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Kveikt á tímabundið vegna rafhlöðusparnaðar"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Studd forrit munu einnig skipta yfir í dökkt þema"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Ég skil"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Kjörstillingar"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Tengjast opnum netum"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"nettenging, internetið, þráðlaust, gögn, wifi, wi-fi, wi fi, farsímakerfi, farsími, símafyrirtæki, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Skoða netkerfi sem eru örugg fyrir flug"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Slökkva á flugstillingu"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Skoða örugg netkerfi fyrir flugstillingu"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Slökkva á flugstillingu"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Tengt"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Internetið tengist ekki sjálfkrafa"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Engin önnur net í boði"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Ekkert net í boði"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Ekki í boði vegna þess að kveikt er á háttatímastillingu"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Endurstilling forgangs tilkynninga tókst."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Forrit"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Ótraust tæki vill fá aðgang að skilaboðunum þínum. Ýttu til að fá frekari upplýsingar."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Leyfa aðgang að skilaboðum?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Ótraust Bluetooth-tæki, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], vill fá aðgang að skilaboðunum þínum.\n\nÞú hefur ekki tengst [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] áður."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Ótraust Bluetooth-tæki, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, vill fá aðgang að skilaboðunum þínum.\n\nÞú hefur ekki tengst <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> áður."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Ótraust tæki vill fá aðgang að tengiliðunum þínum og símtalaskránni. Ýttu til að fá frekari upplýsingar."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Leyfa aðgang að tengiliðum og símtalaskrá?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Ótraust Bluetooth-tæki, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], vill fá aðgang að tengiliðum þínum og símtalaskrá. Þetta felur í sér gögn um móttekin og hringd símtöl.\n\nÞú hefur ekki tengst [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] áður."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Ótraust Bluetooth-tæki, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, vill fá aðgang að tengiliðum þínum og símtalaskrá. Þetta felur í sér gögn um móttekin og hringd símtöl.\n\nÞú hefur ekki tengst <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> áður."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Birtustig"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Lásskjár"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Sýnileiki"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Litur"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Annað"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 5e08e69..807c5bf 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Ora fine"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Stato"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intensità"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Off/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Non verrà mai attivata automaticamente"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Verrà attivata automaticamente alle ore <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Verrà attivata automaticamente al tramonto"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"On/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Non verrà mai disattivata automaticamente"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Verrà disattivata automaticamente alle ore <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Verrà disattivata automaticamente al tramonto"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Attivo dal tramonto all\'alba"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Attivo in orario personalizzato"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Stato"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Off/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Non verrà mai attivato automaticamente"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Verrà attivato automaticamente al tramonto"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Verrà attivata automaticamente alle ore <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"On/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Non verrà mai disattivato automaticamente"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Verrà disattivato automaticamente al tramonto"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Verrà disattivata automaticamente alle ore <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Screen reader"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio e testo su schermo"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Display"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Controlli di interazione"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"App scaricate"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Sperimentali"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Elimina utente"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Elimina"</string>
     <string name="user_guest" msgid="4545590092001460388">"Ospite"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Rimuovi ospite"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Rimuovere l\'ospite?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Cancella i dati ospite"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Termina sessione Ospite"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Vuoi terminare la sessione Ospite?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Tutte le app e i dati di questa sessione verranno eliminati."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Rimuovi"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Termina sessione"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Attiva chiamate"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Attiva chiamate e SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Elimina utente"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Conversazioni non prioritarie"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Conversazioni a cui hai apportato modifiche"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Conversazioni recenti"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Cancella recenti"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Cancella tutte recenti"</string>
     <string name="clear" msgid="5092178335409471100">"Cancella"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Usa bolla per conversazioni prioritarie"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Le conversazioni prioritarie vengono mostrate nella parte superiore dell\'area a discesa. Puoi anche impostarle in modo che vengano visualizzate come bolle e che interrompano la modalità Non disturbare."</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Connesso a più dispositivi"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Modalità demo dell\'interfaccia utente di sistema"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Tema scuro"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"On/Opzione disattivata temporaneamente per Risparmio energetico"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Disattivata temporaneamente a causa del Risparmio energetico"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Anche le app supportate passeranno al tema scuro"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"OK"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferenze"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Connetti a reti pubbliche"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"connessione rete, internet, wireless, dati, wifi, wi-fi, wi fi, cellulare, dispositivo mobile, operatore cellulare, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Visualizza reti utilizzabili in aereo"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Disattiva la modalità aereo"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Visualizza reti con modalità aereo"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Disattiva la modalità aereo"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Connessione attiva"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"La connessione a Internet non sarà automatica"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Nessun\'altra rete disponibile"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Nessuna rete disponibile"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Non disponibili perché la modalità Riposo è attiva"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Reimpostazione dell\'importanza delle notifiche completata."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"App"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Un dispositivo non attendibile richiede l\'accesso ai tuoi messaggi. Tocca per conoscere i dettagli."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Vuoi consentire l\'accesso ai messaggi?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Un dispositivo Bluetooth non attendibile, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], richiede l\'accesso ai tuoi messaggi.\n\nNon hai mai effettuato la connessione al dispositivo [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Un dispositivo Bluetooth non attendibile, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, richiede l\'accesso ai tuoi messaggi.\n\nNon hai mai effettuato la connessione al dispositivo <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Un dispositivo non attendibile richiede l\'accesso ai tuoi contatti e al tuo registro chiamate. Tocca per conoscere i dettagli."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Vuoi consentire l\'accesso a contatti e registro chiamate?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Un dispositivo Bluetooth non attendibile, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], richiede l\'accesso ai tuoi contatti e al tuo registro chiamate, inclusi i dati relativi a chiamate in arrivo e in uscita.\n\nNon hai mai effettuato la connessione al dispositivo [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Un dispositivo Bluetooth non attendibile, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, richiede l\'accesso ai tuoi contatti e al tuo registro chiamate, inclusi i dati relativi a chiamate in arrivo e in uscita.\n\nNon hai mai effettuato la connessione al dispositivo <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Luminosità"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Schermata di blocco"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Visibilità"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Colore"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Altre"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 2421999..a705a9d 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -1102,9 +1102,9 @@
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"אפשר לחבר מכשירים נוספים לנקודה <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"הסיסמה לנקודה לשיתוף אינטרנט"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"‏תדר AP"</string>
-    <string name="wifi_hotspot_footer_info_regular" msgid="6620216295510397461">"‏יש לך אפשרות להשתמש בנקודה לשיתוף אינטרנט כדי ליצור רשת Wi‑Fi ולחבר אליה את המכשירים האחרים. נקודות לשיתוף אינטרנט מספקות חיבור לאינטרנט דרך חבילת הגלישה שלך. ייתכן שהשימוש יהיה כרוך בתשלום נוסף על חבילת הגלישה."</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="6620216295510397461">"‏ניתן להשתמש בנקודה לשיתוף אינטרנט (hotspot) כדי ליצור רשת Wi‑Fi ולחבר אליה את המכשירים האחרים. נקודות לשיתוף אינטרנט מספקות חיבור לאינטרנט דרך חבילת הגלישה שלך. ייתכן שהשימוש יהיה כרוך בתשלום נוסף על חבילת הגלישה."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="3813311942370920903">"אפשר להשתמש באפליקציות כדי ליצור נקודה לשיתוף אינטרנט ולשתף תכנים בין מכשירים שנמצאים בקרבת מקום."</string>
-    <string name="wifi_hotspot_auto_off_title" msgid="8855711787485504882">"כיבוי אוטומטי של נקודה לשיתוף אינטרנט"</string>
+    <string name="wifi_hotspot_auto_off_title" msgid="8855711787485504882">"כיבוי אוטומטי של נקודת האינטרנט"</string>
     <string name="wifi_hotspot_auto_off_summary" msgid="8283656069997871354">"כשאין מכשירים מחוברים"</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"מפעיל נקודה לשיתוף אינטרנט…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"מכבה נקודה לשיתוף אינטרנט…"</string>
@@ -1269,11 +1269,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"שעת סיום"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"סטטוס"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"עוצמה"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"כבוי / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"ללא הפעלה אוטומטית"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"הפעלה אוטומטית בשעה <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"הפעלה אוטומטית בשקיעה"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"פועל / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"ללא כיבוי אוטומטי"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"כיבוי אוטומטית בשעה <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"כיבוי אוטומטי בזריחה"</string>
@@ -1296,11 +1294,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"הפעלה מהשקיעה עד הזריחה"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"הפעלה בשעה שאני אקבע"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"סטטוס"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"כבוי / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"ללא הפעלה אוטומטית"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"הפעלה אוטומטית בשקיעה"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"הפעלה אוטומטית בשעה <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"פועל / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"ללא כיבוי אוטומטי"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"כיבוי אוטומטי בזריחה"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"כיבוי אוטומטי בשעה <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -1696,22 +1692,22 @@
     <string name="tether_settings_title_usb_bluetooth" msgid="4437274151658505496">"שיתוף אינטרנט בין ניידים"</string>
     <string name="tether_settings_title_all" msgid="6807525590937697228">"‏שיתוף אינטרנט (hotspot ו-tethering)"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="6110241048260139633">"‏שיתוף האינטרנט פועל (hotspot ו-tethering)"</string>
-    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="5057598961245943644">"נקודה לשיתוף אינטרנט פועלת"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="5057598961245943644">"נקודת האינטרנט פועלת"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="7181518138494995888">"שיתוף אינטרנט"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="9054069463426952689">"‏לא ניתן לשתף אינטרנט בין ניידים או להשתמש בנקודה ניידת לשיתוף אינטרנט כשחוסך הנתונים (Data Saver) פועל."</string>
-    <string name="tether_settings_summary_hotspot_only" msgid="8529008147731140279">"נקודה לשיתוף אינטרנט בלבד"</string>
+    <string name="tether_settings_summary_hotspot_only" msgid="8529008147731140279">"‏רק נקודת אינטרנט (hotspot)"</string>
     <string name="tether_settings_summary_usb_tethering_only" msgid="6351624505239356221">"‏USB בלבד"</string>
     <string name="tether_settings_summary_bluetooth_tethering_only" msgid="1451008625343274930">"‏Bluetooth בלבד"</string>
     <string name="tether_settings_summary_ethernet_tethering_only" msgid="3582266687537419309">"‏Ethernet בלבד"</string>
     <string name="tether_settings_summary_hotspot_and_usb" msgid="5999349643653265016">"‏נקודה לשיתוף אינטרנט, USB"</string>
     <string name="tether_settings_summary_hotspot_and_bluetooth" msgid="810514646401708557">"‏נקודה לשיתוף אינטרנט, Bluetooth"</string>
-    <string name="tether_settings_summary_hotspot_and_ethernet" msgid="5489192670354277152">"‏נקודה לשיתוף אינטרנט, Ethernet"</string>
+    <string name="tether_settings_summary_hotspot_and_ethernet" msgid="5489192670354277152">"‏נקודת אינטרנט, Ethernet"</string>
     <string name="tether_settings_summary_usb_and_bluetooth" msgid="1355680331767261967">"‏USB,‏ Bluetooth"</string>
     <string name="tether_settings_summary_usb_and_ethernet" msgid="2195017679820919905">"‏USB, ‏Ethernet"</string>
     <string name="tether_settings_summary_bluetooth_and_ethernet" msgid="1015253926959211012">"‏Bluetooth,‏ Ethernet"</string>
     <string name="tether_settings_summary_hotspot_and_usb_and_bluetooth" msgid="2949043525073791732">"‏נקודה לשיתוף אינטרנט, USB,‏ Bluetooth"</string>
-    <string name="tether_settings_summary_hotspot_and_usb_and_ethernet" msgid="5178946567323581144">"‏נקודה לשיתוף אינטרנט, USB, ‏Ethernet"</string>
-    <string name="tether_settings_summary_hotspot_and_bluetooth_and_ethernet" msgid="4104425838594994441">"‏נקודה לשיתוף אינטרנט, Bluetooth, ‏Ethernet"</string>
+    <string name="tether_settings_summary_hotspot_and_usb_and_ethernet" msgid="5178946567323581144">"‏נקודת אינטרנט, USB, ‏Ethernet"</string>
+    <string name="tether_settings_summary_hotspot_and_bluetooth_and_ethernet" msgid="4104425838594994441">"‏נקודת אינטרנט, Bluetooth, ‏Ethernet"</string>
     <string name="tether_settings_summary_usb_and_bluetooth_and_ethernet" msgid="5880591133984166550">"‏USB,‏ Bluetooth,‏ Ethernet"</string>
     <string name="tether_settings_summary_all" msgid="7565193614882005775">"‏נקודה לשיתוף אינטרנט, USB, ‏Bluetooth, ‏Ethernet"</string>
     <string name="tether_settings_summary_off" msgid="2526164899130351968">"לא יתבצע שיתוף של חיבור לאינטרנט עם מכשירים אחרים"</string>
@@ -1736,7 +1732,7 @@
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"קשירת <xliff:g id="DEVICE_NAME">%1$s</xliff:g> תבוטל."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"‏שיתוף אינטרנט דרך Ethernet"</string>
     <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"‏שיתוף החיבור לאינטרנט של הטלפון דרך Ethernet"</string>
-    <string name="tethering_footer_info" msgid="6782375845587483281">"אפשר להשתמש בנקודה לשיתוף אינטרנט ובשיתוף אינטרנט בין ניידים כדי לאפשר למכשירים אחרים להתחבר לאינטרנט דרך חבילת הגלישה שלך. ניתן גם להשתמש באפליקציות כדי ליצור נקודה לשיתוף אינטרנט ולשתף תכנים בין מכשירים שנמצאים בקרבת מקום."</string>
+    <string name="tethering_footer_info" msgid="6782375845587483281">"‏בעזרת נקודה לשיתוף אינטרנט (hotspot) ושיתוף אינטרנט בין ניידים (tethering) אפשר לתת למכשירים אחרים להתחבר לאינטרנט דרך חבילת הגלישה שלך. יש גם אפליקציות ליצירת נקודת אינטרנט ולשיתוף תכנים בין מכשירים שנמצאים בקרבת מקום."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"‏נקודה לשיתוף אינטרנט (Hotspot) ושיתוף אינטרנט בין מכשירים (tethering) מאפשרים למכשירים אחרים להתחבר לאינטרנט דרך Wi-Fi או דרך חבילת הגלישה שלך. יש גם אפליקציות שמאפשרות ליצור נקודה לשיתוף אינטרנט ולשתף תכנים עם מכשירים קרובים."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"עזרה"</string>
     <string name="network_settings_title" msgid="4663717899931613176">"רשתות סלולריות"</string>
@@ -2184,6 +2180,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"קוראי מסך"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"הקראת טקסט שמופיע במסך"</string>
     <string name="display_category_title" msgid="6638191682294461408">"תצוגה"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"פקדי אינטראקציה"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"אפליקציות שהורדת"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"ניסיוני"</string>
@@ -3161,10 +3159,15 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"מחק משתמש"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"מחיקה"</string>
     <string name="user_guest" msgid="4545590092001460388">"אורח"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"הסר אורח"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"להסיר אורח?"</string>
+    <!-- no translation found for user_clear_guest_menu (4864362688187480452) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_menu (5064400453222497734) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_confirm_title (7526978959527761497) -->
+    <skip />
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"כל האפליקציות והנתונים בפעילות זו באתר יימחקו."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"הסר"</string>
+    <!-- no translation found for user_exit_guest_dialog_remove (8095094235815676847) -->
+    <skip />
     <string name="user_enable_calling" msgid="264875360626905535">"הפעלת שיחות טלפון"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"‏הפעלת שיחות טלפון ו-SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"מחיקת משתמש"</string>
@@ -3408,7 +3411,7 @@
     <string name="keywords_assist_input" msgid="3086289530227075593">"ברירת מחדל, אסיסט"</string>
     <string name="keywords_default_payment_app" msgid="5162298193637362104">"תשלום, ברירת מחדל"</string>
     <string name="keywords_ambient_display" msgid="3149287105145443697">"התראה נכנסת"</string>
-    <string name="keywords_hotspot_tethering" msgid="3688439689671232627">"‏שיתוף אינטרנט בין מכשירים ב-USB, שיתוף אינטרנט בין מכשירים ב-Bluetooth, נקודת Wi-Fi לשיתוף אינטרנט"</string>
+    <string name="keywords_hotspot_tethering" msgid="3688439689671232627">"‏שיתוף אינטרנט ב-USB, שיתוף אינטרנט ב-Bluetooth, נקודת Wi-Fi ‏(hotspot)"</string>
     <string name="keywords_touch_vibration" msgid="1125291201902251273">"פיזי, רטט, מסך, רגישות"</string>
     <string name="keywords_ring_vibration" msgid="1736301626537417541">"מגע, רטט, טלפון, שיחה, רגישות, צלצול"</string>
     <string name="keywords_notification_vibration" msgid="9162262178415439951">"מגע, רטט, רגישות"</string>
@@ -3681,7 +3684,8 @@
     <string name="other_conversations" msgid="551178916855139870">"שיחות בעדיפות לא גבוהה"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"שיחות שערכת בהן שינויים"</string>
     <string name="recent_conversations" msgid="471678228756995274">"שיחות אחרונות"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"מחיקת פריטים אחרונים"</string>
+    <!-- no translation found for conversation_settings_clear_recents (4246342656145488662) -->
+    <skip />
     <string name="clear" msgid="5092178335409471100">"ניקוי"</string>
     <string name="important_bubble" msgid="7911698275408390846">"הצגת שיחות בעדיפות גבוהה בבועות"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"שיחות בעדיפות גבוהה יוצגו בחלק העליון של חלונית ההתראות הנפתחת. בנוסף, אפשר להגדיר שיוצגו בבועות ויפריעו לתכונה \'נא לא להפריע\'."</string>
@@ -4564,7 +4568,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"מחובר לכמה התקנים"</string>
     <string name="demo_mode" msgid="6566167465451386728">"מצב הדגמה בממשק המשתמש של המערכת"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"עיצוב כהה"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"העיצוב הכהה פעיל. המתג מושבת זמנית כי הופעל מצב \'חיסכון בסוללה\'"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"המתג מופעל באופן זמני כי מצב \'חיסכון בסוללה\' הופעל"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"גם אפליקציות נתמכות יעברו לעיצוב כהה"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"הבנתי"</string>
@@ -5229,15 +5234,34 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"העדפות"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"חיבור לרשתות ציבוריות"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"‏חיבור לרשת, אינטרנט, אלחוטי, נתונים, Wi-Fi, wi-fi, wi fi, סלולרי, נייד, ספק סלולרי, 4g,‏ 3g,‏ 2g,‏ lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"הצגת רשתות בטוחות לטיסה"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"כיבוי מצב טיסה"</string>
+    <!-- no translation found for view_airplane_safe_networks (9170023210981508906) -->
+    <skip />
+    <!-- no translation found for turn_off_airplane_mode (7141986366534514443) -->
+    <skip />
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"מחובר"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"לא ניתן להתחבר לאינטרנט באופן אוטומטי"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"אין רשתות זמינות אחרות"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"אין רשתות זמינות"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"אינו זמין כאשר מצב שינה מופעל"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"הושלם איפוס הגדרת החשיבות של ההתראות."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"אפליקציות"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"מכשיר לא מהימן מבקש לקבל גישה להודעות. יש להקיש לקבלת פרטים."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"להעניק גישה להודעות?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"‏מכשיר Bluetooth לא מהימן, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], מבקש גישה להודעות.\n\nלא התחברת בעבר למכשיר [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"‏מכשיר Bluetooth לא מהימן, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, מבקש גישה להודעות.\n\nלא התחברת בעבר למכשיר <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"מכשיר לא מהימן מבקש גישה לאנשי הקשר וליומן השיחות. יש להקיש לקבלת פרטים."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"להעניק גישה לאנשי הקשר וליומן השיחות?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"‏מכשיר Bluetooth לא מהימן, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], מבקש גישה לאנשי הקשר וליומן השיחות. הגישה תכלול גם נתונים על שיחות נכנסות ויוצאות.\n\nלא התחברת בעבר למכשיר [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"‏מכשיר Bluetooth לא מהימן, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, מבקש גישה לאנשי הקשר וליומן השיחות. הגישה תכלול גם נתונים על שיחות נכנסות ויוצאות.\n\nלא התחברת בעבר למכשיר <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
+    <!-- no translation found for category_name_brightness (8520372392029305084) -->
+    <skip />
+    <!-- no translation found for category_name_lock_display (7478785189102882266) -->
+    <skip />
+    <!-- no translation found for category_name_visibility (4485030512199246405) -->
+    <skip />
+    <!-- no translation found for category_name_color (937514550918977151) -->
+    <skip />
+    <!-- no translation found for category_name_others (2366006298768550310) -->
+    <skip />
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index b4eb687..d632568 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -24,11 +24,11 @@
     <string name="confirmation_turn_on" msgid="2979094011928347665">"ON にする"</string>
     <string name="device_info_default" msgid="1406619232867343310">"不明"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="1646187747875476269">
-      <item quantity="other">デベロッパーになるまであと<xliff:g id="STEP_COUNT_1">%1$d</xliff:g>ステップです。</item>
-      <item quantity="one">デベロッパーになるまであと<xliff:g id="STEP_COUNT_0">%1$d</xliff:g>ステップです。</item>
+      <item quantity="other">開発者向けオプションが有効になるまであと <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> 回です</item>
+      <item quantity="one">開発者向けオプションが有効になるまであと <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> 回です</item>
     </plurals>
-    <string name="show_dev_on" msgid="2840850085134853754">"これでデベロッパーになりました！"</string>
-    <string name="show_dev_already" msgid="7041756429707644630">"開発者向けオプションが既に有効です。"</string>
+    <string name="show_dev_on" msgid="2840850085134853754">"開発者向けオプションが有効になりました"</string>
+    <string name="show_dev_already" msgid="7041756429707644630">"開発者向けオプションはすでに有効です"</string>
     <string name="dev_settings_disabled_warning" msgid="6971867026249671244">"まず開発者向けオプションを有効にしてください。"</string>
     <string name="header_category_wireless_networks" msgid="303445626075235229">"無線とネットワーク"</string>
     <string name="header_category_system" msgid="1665516346845259058">"システム"</string>
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"終了時間"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"ステータス"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"輝度"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"OFF / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"自動で ON にしない"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"自動的に ON: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"自動的に ON: 日の入り"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"ON / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"自動で OFF にしない"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"自動的に OFF: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"自動的に OFF: 日の出"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"日の入りから日の出まで ON"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"指定した時間にオン"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"ステータス"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"OFF / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"自動で ON にしない"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"日の入りに自動的に ON"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"自動的にオン: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"ON / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"自動で OFF にしない"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"日の出に自動的に OFF"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"自動的にオフ: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"スクリーン リーダー"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"音声と画面上のテキスト"</string>
     <string name="display_category_title" msgid="6638191682294461408">"表示"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"操作のコントロール"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"ダウンロードしたアプリ"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"試験運用機能"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"ユーザーを削除"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"削除"</string>
     <string name="user_guest" msgid="4545590092001460388">"ゲスト"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"ゲストを削除"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"ゲストを削除しますか？"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"ゲストのデータを削除"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"ゲスト セッションを終了する"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"ゲスト セッションを終了しますか？"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"このセッションでのアプリとデータはすべて削除されます。"</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"削除"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"セッションを終了"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"通話をON"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"通話とSMSをON"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"ユーザーの削除"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"優先度の低い会話"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"設定に変更を加えた会話"</string>
     <string name="recent_conversations" msgid="471678228756995274">"最近の会話"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"最近の項目の消去"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"最近の全項目を削除"</string>
     <string name="clear" msgid="5092178335409471100">"消去"</string>
     <string name="important_bubble" msgid="7911698275408390846">"優先度の高い会話をバブルとして表示"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"優先度の高い会話はプルダウン シェードの一番上に表示されます。サイレント モードに割り込んでバブルとして表示されるよう、設定することもできます。"</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"複数のデバイスに接続しました"</string>
     <string name="demo_mode" msgid="6566167465451386728">"システム UI デモモード"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"ダークテーマ"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"ON / バッテリー セーバーにより一時的に無効になりました"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"バッテリー セーバーにより一時的に有効になりました"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"サポートされているアプリもダークテーマに切り替わります"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"OK"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"設定"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"パブリック ネットワークに接続する"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ネットワーク接続, インターネット, ワイヤレス, データ, wifi, Wi-Fi, ワイファイ, 携帯, モバイル, 携帯通信会社, 4G, 3G, 2G, LTE"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"機内で利用できるネットワークを表示"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"機内モードを OFF にする"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"機内モードのネットワークを表示"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"機内モードを OFF にする"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"接続済み"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"インターネットに自動的に接続されません"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"利用できるネットワークはありません"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"ネットワークを利用できません"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"おやすみ時間モードが ON のため利用できません"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"通知の重要度をリセットしました。"</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"アプリ"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"信頼できないデバイスがメッセージにアクセスしようとしています。タップして詳細をご確認ください。"</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"メッセージへのアクセスを許可しますか？"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"信頼できない Bluetooth デバイス「<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>」がメッセージにアクセスしようとしています。\n\nこれまでに「<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>」に接続したことはありません。"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"信頼できない Bluetooth デバイス <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> がメッセージにアクセスしようとしています。\n\nこれまでに <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> に接続したことはありません。"</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"信頼できないデバイスが連絡先と通話履歴にアクセスしようとしています。タップして詳細をご確認ください。"</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"連絡先と通話履歴へのアクセスを許可しますか？"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"信頼できない Bluetooth デバイス「<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>」が連絡先と通話履歴にアクセスしようとしています。これには着信や発信に関するデータも含まれます。\n\nこれまでに「<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>」に接続したことはありません。"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"信頼できない Bluetooth デバイス <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> が連絡先と通話履歴にアクセスしようとしています。これには着信や発信に関するデータも含まれます。\n\nこれまでに <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> に接続したことはありません。"</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"明るさ"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"ディスプレイのロック"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"公開設定"</string>
+    <string name="category_name_color" msgid="937514550918977151">"カラー"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"その他"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 64e214d..6192ea3 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"დასრულების დრო"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"სტატუსი"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"ინტენსივობა"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"გამორთულია / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"არასოდეს ჩაირთვება ავტომატურად"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"ავტომატურად ჩაირთვება <xliff:g id="ID_1">%1$s</xliff:g>-ზე"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"ავტომატურად ჩაირთვება მზის ჩასვლისას"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"ჩართულია / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"არასოდეს გამოირთვება ავტომატურად"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"ავტომატურად გამოირთვება <xliff:g id="ID_1">%1$s</xliff:g>-ზე"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"ავტომატურად გამოირთვება მზის ამოსვლისას"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"ჩაირთვება მზის ჩასვლიდან ამოსვლამდე"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"ჩაირთვება თქვენზე მორგებულ დროს"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"სტატუსი"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"გამორთულია / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"არასოდეს ჩაირთვება ავტომატურად"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"ავტომატურად ჩაირთვება მზის ჩასვლისას"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"ავტომატურად ჩაირთვება <xliff:g id="ID_1">%1$s</xliff:g>-ზე"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"ჩართულია / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"არასოდეს გამოირთვება ავტომატურად"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"ავტომატურად გამოირთვება მზის ამოსვლისას"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"ავტომატურად გამოირთვება <xliff:g id="ID_1">%1$s</xliff:g>-ზე"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"ეკრანის წამკითხველები"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"აუდიო და ეკრანზე გამოტანილი ტექსტი"</string>
     <string name="display_category_title" msgid="6638191682294461408">"ეკრანი"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"ინტერაქციის მართვის საშუალებები"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"ჩამოტვირთული აპები"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"ექსპერიმენტული"</string>
@@ -3075,10 +3073,15 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"მომხმარებლის წაშლა"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"წაშლა"</string>
     <string name="user_guest" msgid="4545590092001460388">"სტუმარი"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"სტუმრის ამოშლა"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"სტუმრის ამოშლა?"</string>
+    <!-- no translation found for user_clear_guest_menu (4864362688187480452) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_menu (5064400453222497734) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_confirm_title (7526978959527761497) -->
+    <skip />
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"ამ სესიის ყველა აპი და მონაცემი წაიშლება."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"ამოშლა"</string>
+    <!-- no translation found for user_exit_guest_dialog_remove (8095094235815676847) -->
+    <skip />
     <string name="user_enable_calling" msgid="264875360626905535">"სატელეფონო ზარების ჩართვა"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"სატელ. ზარების და SMS-ის ჩართვა"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"მომხმარებლის წაშლა"</string>
@@ -3591,7 +3594,8 @@
     <string name="other_conversations" msgid="551178916855139870">"არაპრიორიტეტული მიმოწერები"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"მიმოწერები, რომლებშიც ცვლილებები შეიტანეთ"</string>
     <string name="recent_conversations" msgid="471678228756995274">"ბოლო მიმოწერები"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"ბოლოების გასუფთავება"</string>
+    <!-- no translation found for conversation_settings_clear_recents (4246342656145488662) -->
+    <skip />
     <string name="clear" msgid="5092178335409471100">"გასუფთავება"</string>
     <string name="important_bubble" msgid="7911698275408390846">"პრიორიტეტული მიმოწერების ბუშტებად ჩვენება"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"პრიორიტეტული მიმოწერები გამოჩნდება ჩამოსაშლელი ფარდის ზედა ნაწილში. ასევე, მათი დაყენება შეგიძლიათ ისე, რომ გამოჩნდნენ ბუშტებად და შეწყვიტონ „არ შემაწუხოთ“ რეჟიმი."</string>
@@ -4424,7 +4428,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"დაკავშირებულია რამდენიმე მოწყობილობასთან"</string>
     <string name="demo_mode" msgid="6566167465451386728">"სისტემის UI-ს დემო-რეჟიმი"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"მუქი თემა"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"ჩართულია / დროებით გათიშულია ბატარეის დამზოგის გამო"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"დროებით ჩართულია ბატარეის დამზოგის გამო"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"მხარდაჭერილი აპებიც მუქ თემაზე გადაირთვება"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"გასაგებია"</string>
@@ -5063,15 +5068,34 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"პრიორიტეტები"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"საჯარო ქსელებთან დაკავშირება"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ქსელთან კავშირი, ინტერნეტი, უსადენო, მონაცემები, wifi, wi-fi, wi fi, ფიჭური, მობილური, ფიჭური ოპერატორი, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"თვითმფრინავისთვის უსაფრთხო ქსელის ნახვა"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"თვითმფრინავის რეჟიმის გამორთვა"</string>
+    <!-- no translation found for view_airplane_safe_networks (9170023210981508906) -->
+    <skip />
+    <!-- no translation found for turn_off_airplane_mode (7141986366534514443) -->
+    <skip />
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"დაკავშირებული"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"ინტერნეტს ავტომატურად არ დაუკავშირდება"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"სხვა ქსელები მიუწვდომელია"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"ქსელები მიუწვდომელია"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"მიუწვდომელია, რადგან ჩართულია ძილის დროის რეჟიმი"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"შეტყობინების მნიშვნელობის გადაყენება დასრულებულია."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"აპები"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"არასანდო მოწყობილობას თქვენს შეტყობინებებზე წვდომა სურს. შეეხეთ დეტალების სანახავად."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"დაუშვებთ შეტყობინებებზე წვდომას?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"არასანდო Bluetooth მოწყობილობას, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], თქვენს შეტყობინებებზე წვდომა სურს.\n\nაქამდე [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]-ს არ დაკავშირებიხართ."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"არასანდო Bluetooth მოწყობილობას, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, თქვენს შეტყობინებებზე წვდომა სურს.\n\nაქამდე <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>-ს არ დაკავშირებიხართ."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"არასანდო მოწყობილობას თქვენს კონტაქტებსა და ზარების ჟურნალზე წვდომა სურს. შეეხეთ დეტალების სანახავად."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"დაუშვებთ წვდომას კონტაქტებსა და ზარების ჟურნალზე?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"არასანდო Bluetooth მოწყობილობას, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], თქვენს კონტაქტებსა და ზარების ჟურნალზე წვდომა სურს. ეს მოიცავს მონაცემებს შემომავალი და გამავალი ზარების შესახებ.\n\nაქამდე [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]-ს არ დაკავშირებიხართ."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"არასანდო Bluetooth მოწყობილობას, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, თქვენს კონტაქტებსა და ზარების ჟურნალზე წვდომა სურს. ეს მოიცავს მონაცემებს შემომავალი და გამავალი ზარების შესახებ.\n\nაქამდე <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>-ს არ დაკავშირებიხართ."</string>
+    <!-- no translation found for category_name_brightness (8520372392029305084) -->
+    <skip />
+    <!-- no translation found for category_name_lock_display (7478785189102882266) -->
+    <skip />
+    <!-- no translation found for category_name_visibility (4485030512199246405) -->
+    <skip />
+    <!-- no translation found for category_name_color (937514550918977151) -->
+    <skip />
+    <!-- no translation found for category_name_others (2366006298768550310) -->
+    <skip />
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index a785e88..3d7a631 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Аяқталу уақыты"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Күйі"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Қарқын"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Өшірулі / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Автоматты қосылмайды"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Автоматты қосылады: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Күн батқанда, автоматты түрде қосылады"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Қосулы / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Автоматты өшпейді"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Автоматты өшеді: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Күн шыққанда, автоматты өшеді"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Күн батқаннан таңға дейін қосулы"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Арнаулы уақытта қосылады"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Күйі"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Өшірулі / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Автоматты қосылмайды"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Күн батқанда, автоматты түрде қосылады"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Автоматты түрде қосылады: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Қосулы / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Автоматты өшпейді"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Күн шыққанда, автоматты өшеді"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Автоматты түрде өшеді: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Экранды оқу құралдары"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Аудио және экранға шығатын мәтін"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Дисплей"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Басқару элементтері"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Жүктеп алынған қолданбалар"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Эксперименттік"</string>
@@ -2456,7 +2454,7 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Планшет әдеттегіден көп қолданылды"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Құрылғы әдеттегіден көп қолданылды"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Батареяның заряды тез бітуі мүмкін."</string>
-    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Батареяның жұмыс істеу қабілеті оңтайландырылуда"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Батарея жұмысын оңтайландыру"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Батарея жұмысы уақытша шектелген. Толығырақ ақпарат алу үшін түртіңіз."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Телефоныңыз әдеттегіден көп қолданылды. Батареяның заряды тез бітуі мүмкін.\n\nБатареяны ең көп пайдаланатын қолданбалар:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Планшетіңіз әдеттегіден көп пайдаланылды. Батареяның заряды тез бітуі мүмкін.\n\nБатареяны ең көп пайдаланатын қолданбалар:"</string>
@@ -3075,10 +3073,15 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Пайдаланушыны жою"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Жою"</string>
     <string name="user_guest" msgid="4545590092001460388">"Қонақ"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Қонақты жою"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Қонақты жою керек пе?"</string>
+    <!-- no translation found for user_clear_guest_menu (4864362688187480452) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_menu (5064400453222497734) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_confirm_title (7526978959527761497) -->
+    <skip />
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Осы сеанстағы барлық қолданбалар мен деректер жойылады."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Алып тастау"</string>
+    <!-- no translation found for user_exit_guest_dialog_remove (8095094235815676847) -->
+    <skip />
     <string name="user_enable_calling" msgid="264875360626905535">"Телефон қоңырауларын қосу"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Телефон қоңырауларын және SMS қосу"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Пайдаланушыны жою"</string>
@@ -3591,7 +3594,8 @@
     <string name="other_conversations" msgid="551178916855139870">"Басымдығы төмен сұхбаттар"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Өзгертулер енгізілген әңгімелер"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Соңғы сұхбаттар"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Соңғыларын өшіру"</string>
+    <!-- no translation found for conversation_settings_clear_recents (4246342656145488662) -->
+    <skip />
     <string name="clear" msgid="5092178335409471100">"Өшіру"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Маңызды чаттарды қалқымалы ету"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Маңызды әңгімелер ашылмалы панельдің жоғарғы жағында көрсетіледі. Оларды қалқыма хабар ретінде және \"Мазаламау\" режимі қосулы болса да шығатындай етіп реттеуіңізге болады."</string>
@@ -4424,7 +4428,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Түрлі құрылғыларға қосылған"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Жүйе интерфейсінің демо режимі"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Қараңғы тақырып"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Battery Saver функциясына байланысты қосулы/уақытша өшірулі"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Battery Saver функциясына байланысты уақытша қосулы"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Қолдауға ие қолданбалар да қараңғы тақырыпқа ауысады."</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Түсінікті"</string>
@@ -5063,15 +5068,34 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Параметрлер"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Қоғамдық жерлердегі желілерге қосылу"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"желі байланысы, интернет, сымсыз байланыс, деректер, wifi, Wi-Fi, Wi Fi, ұялы, мобильдік, ұялы байланыс операторы, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Ұшақта қолдануға болатын желілерді көру"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Ұшақ режимін өшіру"</string>
+    <!-- no translation found for view_airplane_safe_networks (9170023210981508906) -->
+    <skip />
+    <!-- no translation found for turn_off_airplane_mode (7141986366534514443) -->
+    <skip />
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Қосылды"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Интернет автоматты түрде қосылмайды"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Басқа қолжетімді желі жоқ"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Қолжетімді желілер жоқ"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Ұйықтау уақыты режимі қосулы болғандықтан, қолжетімді емес."</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Хабарландырулардың маңыздылық параметрлерін бастапқы күйге қайтару аяқталды."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Қолданбалар"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Күдікті құрылғы хабарларыңызды пайдаланғысы келеді. Толық мәлімет алу үшін түртіңіз."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Хабарларды пайдалануға рұқсат берілсін бе?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Күдікті Bluetooth құрылғысы ([<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]) хабарларыңызды пайдаланғысы келеді.\n\nСіз бұрын-соңды [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] құрылғысына қосылмағансыз."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Күдікті Bluetooth құрылғысы (<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>) хабарларыңызды пайдаланғысы келеді.\n\nСіз бұрын-соңды <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> құрылғысына қосылмағансыз."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Күдікті құрылғы контактілер тізімі мен қоңыраулар журналын пайдаланғысы келеді. Толық мәлімет алу үшін түртіңіз."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Контактілер тізімі мен қоңыраулар журналын пайдалануға рұқсат берілсін бе?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Күдікті Bluetooth құрылғысы ([<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]) контактілер тізімі мен қоңыраулар журналын пайдаланғысы келеді. Оған кіріс және шығыс қоңыраулары деректері кіреді.\n\nСіз бұрын-соңды [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] құрылғысына қосылмағансыз."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Күдікті Bluetooth құрылғысы (<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>) контактілер тізімі мен қоңыраулар журналын пайдаланғысы келеді. Оған кіріс және шығыс қоңыраулары деректері кіреді.\n\nСіз бұрын-соңды <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> құрылғысына қосылмағансыз."</string>
+    <!-- no translation found for category_name_brightness (8520372392029305084) -->
+    <skip />
+    <!-- no translation found for category_name_lock_display (7478785189102882266) -->
+    <skip />
+    <!-- no translation found for category_name_visibility (4485030512199246405) -->
+    <skip />
+    <!-- no translation found for category_name_color (937514550918977151) -->
+    <skip />
+    <!-- no translation found for category_name_others (2366006298768550310) -->
+    <skip />
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 2b0507c..1154cb6 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"ម៉ោងបញ្ចប់"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"ស្ថានភាព"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"អាំងតង់ស៊ីតេ"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"បិទ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"នឹងមិនបើកដោយស្វ័យប្រវត្តិនោះទេ"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"នឹងបើកដោយស្វ័យប្រវត្តិនៅម៉ោង <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"នឹងបើកដោយស្វ័យប្រវត្តិនៅពេលថ្ងៃលិច"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"បើក / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"នឹងមិនបិទដោយស្វ័យប្រវត្តិទេ"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"នឹងបិទដោយស្វ័យប្រវត្តិនៅម៉ោង <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"នឹងបិទដោយស្វ័យប្រវត្តិពេលថ្ងៃរះ"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"បើកពីពេលថ្ងៃលិចរហូតដល់ពេលថ្ងៃរះ"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"បើកតាមពេលវេលាកំណត់ផ្ទាល់ខ្លួន"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"ស្ថានភាព"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"បិទ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"នឹងមិនបើកដោយស្វ័យប្រវត្តិទេ"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"នឹងបើកដោយស្វ័យប្រវត្តិនៅពេលថ្ងៃលិច"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"នឹងបើកដោយស្វ័យប្រវត្តិនៅម៉ោង <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"បើក / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"នឹងមិនបិទដោយស្វ័យប្រវត្តិទេ"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"នឹងបិទដោយស្វ័យប្រវត្តិនៅពេលថ្ងៃរះ"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"នឹងបិទដោយស្វ័យប្រវត្តិនៅម៉ោង <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"កម្មវិធី​អានអេក្រង់"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"សំឡេង និងអក្សរ​នៅលើអេក្រង់"</string>
     <string name="display_category_title" msgid="6638191682294461408">"បង្ហាញ"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"ការ​គ្រប់គ្រង​អន្តរកម្ម"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"កម្មវិធី​ដែល​បាន​ទាញយក"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"ពិសោធន៍"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"លុប​អ្នក​ប្រើ"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"លុប"</string>
     <string name="user_guest" msgid="4545590092001460388">"ភ្ញៀវ"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"លុប​​​ភ្ញៀវ"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"លុប​ភ្ញៀវ?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"សម្អាតទិន្នន័យភ្ញៀវ"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"បញ្ចប់វគ្គភ្ញៀវ"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"បញ្ចប់វគ្គភ្ញៀវឬ?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"កម្មវិធី និង​ទិន្នន័យ​ទាំងអស់​ក្នុង​សម័យ​​នេះ​នឹង​ត្រូវ​បាន​លុប។"</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"លុបចេញ"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"បញ្ចប់វគ្គ"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"បើកការហៅទូរសព្ទ"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"បើកការហៅទូរសព្ទ និងសារ SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"លុប​អ្នក​ប្រើប្រាស់"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"ការសន្ទនាដែល​មិនមែនជាអាទិភាព"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"ការសន្ទនា​ដែលអ្នកបានធ្វើ​ការផ្លាស់ប្ដូរ"</string>
     <string name="recent_conversations" msgid="471678228756995274">"ការសន្ទនាថ្មីៗ"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"សម្អាត​ការសន្ទនាថ្មីៗ"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"សម្អាតធាតុថ្មីៗទាំងអស់"</string>
     <string name="clear" msgid="5092178335409471100">"សម្អាត"</string>
     <string name="important_bubble" msgid="7911698275408390846">"បង្ហាញ​ការសន្ទនាអាទិភាព​ជាសារលេចឡើង"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"ការសន្ទនាអាទិភាព​បង្ហាញ​នៅ​ផ្នែកខាងលើ​នៃ​ផ្ទាំង​ទាញចុះ។ អ្នកក៏អាចកំណត់​ការសន្ទនាទាំងនោះឱ្យ​បង្ហាញជា​សារលេចឡើង និងផ្អាក​ការកុំ​រំខាន​បានផងដែរ។"</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"បានភ្ជាប់​ទៅ​ឧបករណ៍​ច្រើន"</string>
     <string name="demo_mode" msgid="6566167465451386728">"មុខងារ​សាកល្បង​ UI ​ប្រព័ន្ធ"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"រចនាប័ទ្ម​ងងឹត"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"បើក / បានបិទ​ជា​បណ្តោះអាសន្ន ដោយសារ​កម្មវិធីសន្សំថ្ម"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"បានបើក​ជា​បណ្តោះអាសន្ន ដោយសារ​មុខងារ​សន្សំ​ថ្ម"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"កម្មវិធី​ដែលអាចប្រើបាន​ក៏នឹងប្ដូរទៅ​​រចនាប័ទ្ម​ងងឹតផងដែរ"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"យល់ហើយ"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ចំណូលចិត្ត"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ភ្ជាប់ជាមួយ​បណ្ដាញសាធារណៈ"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ការតភ្ជាប់បណ្ដាញ, អ៊ីនធឺណិត, ឥតខ្សែ, ទិន្នន័យ, wifi, wi-fi, wi fi, បណ្ដាញចល័ត, ឧបករណ៍​ចល័ត, ក្រុមហ៊ុន​សេវាទូរសព្ទចល័ត, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"មើលបណ្ដាញ​មានសុវត្ថិភាព​ពេលជិះយន្តហោះ"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"បិទ​មុខងារពេលជិះ​យន្តហោះ"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"មើលបណ្ដាញ​នៃមុខងារពេល​ជិះ​យន្តហោះ"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"បិទមុខងារពេល​ជិះ​យន្តហោះ"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"បានភ្ជាប់"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"អ៊ីនធឺណិតនឹងមិនភ្ជាប់ដោយស្វ័យប្រវត្តិទេ"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"មិន​មាន​បណ្ដាញផ្សេងទៀតដែល​អាច​ប្រើ​បានទេ"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"មិន​មាន​បណ្ដាញដែល​អាច​ប្រើ​បានទេ"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"មិនអាច​ប្រើបានទេ ដោយសារ​បើកមុខងារ​ម៉ោងគេង"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"បានបញ្ចប់​ការកំណត់កម្រិតសំខាន់​នៃការជូនដំណឹង​ឡើងវិញ។"</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"កម្មវិធី"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"ឧបករណ៍​ដែលមិនគួរឱ្យទុកចិត្ត​ចង់ចូលប្រើ​សារ​របស់អ្នក។ សូមចុច​ដើម្បី​ទទួលបាន​ព័ត៌មាន​លម្អិត។"</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"អនុញ្ញាតឱ្យ​ចូលប្រើសារឬ?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"ឧបករណ៍​ប៊្លូធូស​ដែលមិនគួរឱ្យទុកចិត្ត [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] ចង់ចូលប្រើ​សារ​របស់អ្នក។\n\nអ្នកមិនបានភ្ជាប់ទៅ [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ពីមុនទេ។"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"ឧបករណ៍​ប៊្លូធូស​ដែលមិនគួរឱ្យទុកចិត្ត <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ចង់ចូលប្រើ​សារ​របស់អ្នក។\n\nអ្នកមិន​បានភ្ជាប់ទៅ <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> ពីមុនទេ។"</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"ឧបករណ៍​ដែលមិនគួរឱ្យទុកចិត្ត​ចង់ចូលប្រើ​ទំនាក់ទំនង និងកំណត់ហេតុហៅទូរសព្ទ​របស់អ្នក។ សូមចុច​ដើម្បី​ទទួលបាន​ព័ត៌មាន​លម្អិត។"</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"អនុញ្ញាតឱ្យ​ចូលប្រើទំនាក់ទំនង និងកំណត់ហេតុហៅទូរសព្ទឬ?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"ឧបករណ៍​ប៊្លូធូស​ដែលមិនគួរឱ្យទុកចិត្ត [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] ចង់ចូលប្រើ​ទំនាក់ទំនង និងកំណត់ហេតុហៅ​ទូរសព្ទ​របស់អ្នក។ សកម្មភាពនេះ​រួមបញ្ចូលទិន្នន័យ​អំពី​ការហៅចូល និងការហៅចេញ។\n\nអ្នកមិនបានភ្ជាប់ទៅ [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ពីមុនទេ។"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"ឧបករណ៍​ប៊្លូធូស​ដែលមិនគួរឱ្យទុកចិត្ត <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ចង់ចូលប្រើ​ទំនាក់ទំនង និងកំណត់ហេតុហៅ​ទូរសព្ទ​របស់អ្នក។ សកម្មភាពនេះ​រួមបញ្ចូលទិន្នន័យ​អំពី​ការហៅចូល និងការហៅចេញ។\n\nអ្នកមិនបានភ្ជាប់ទៅ <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> ពីមុនទេ។"</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"ពន្លឺ"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"ផ្ទាំងអេក្រង់ចាក់សោ"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"លទ្ធភាពមើលឃើញ"</string>
+    <string name="category_name_color" msgid="937514550918977151">"ពណ៌"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"ផ្សេងៗ"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 5d9f06f..ff20b6d 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"ಮುಕ್ತಾಯದ ಸಮಯ"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"ಸ್ಥಿತಿ"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"ತೀಕ್ಷ್ಣತೆ"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"ಆಫ್ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"ಎಂದಿಗೂ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಆಗುವುದಿಲ್ಲ"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"<xliff:g id="ID_1">%1$s</xliff:g> ರಲ್ಲಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಆಗುತ್ತದೆ"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"ಸೂರ್ಯಾಸ್ತದ ಸಮಯದಲ್ಲಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಆಗುತ್ತದೆ"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"ಆನ್ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"ಎಂದಿಗೂ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆಫ್ ಆಗುವುದಿಲ್ಲ"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"<xliff:g id="ID_1">%1$s</xliff:g> ರಲ್ಲಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆಫ್ ಆಗುತ್ತದೆ"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"ಸೂರ್ಯೋದಯದ ಸಮಯದಲ್ಲಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆಫ್ ಆಗುತ್ತದೆ"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"ಬೆಳಗಿನಿಂದ ಸಂಜೆವರೆಗೆ ಆನ್ ಇರುತ್ತದೆ"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"ಕಸ್ಟಮ್ ಸಮಯಕ್ಕೆ ಆನ್ ಆಗುತ್ತದೆ"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"ಸ್ಥಿತಿ"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"ಆಫ್ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"ಎಂದಿಗೂ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಆಗುವುದಿಲ್ಲ"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"ಸೂರ್ಯಾಸ್ತದ ಸಮಯದಲ್ಲಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಆಗುತ್ತದೆ"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"<xliff:g id="ID_1">%1$s</xliff:g> ರಲ್ಲಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಆಗುತ್ತದೆ"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"ಆನ್ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"ಎಂದಿಗೂ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆಫ್ ಆಗುವುದಿಲ್ಲ"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"ಸೂರ್ಯೋದಯದ ಸಮಯದಲ್ಲಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆಫ್ ಆಗುತ್ತದೆ"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"<xliff:g id="ID_1">%1$s</xliff:g> ರಲ್ಲಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆಫ್ ಆಗುತ್ತದೆ"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"ಪರದೆ ರೀಡರ್‌ಗಳು"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ಆಡಿಯೋ ಮತ್ತು ಪರದೆಯ ಮೇಲಿನ ಪಠ್ಯ"</string>
     <string name="display_category_title" msgid="6638191682294461408">"ಪ್ರದರ್ಶನ"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"ಸಂವಹನ ನಿಯಂತ್ರಣಗಳು"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"ಡೌನ್‌ಲೋಡ್ ಮಾಡಲಾದ ಆ್ಯಪ್‌ಗಳು"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"ಪ್ರಾಯೋಗಿಕ"</string>
@@ -2456,7 +2454,7 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"ಟ್ಯಾಬ್ಲೆಟ್ ಸಾಮಾನ್ಯಕ್ಕಿಂತ ಹೆಚ್ಚಿನದನ್ನು ಬಳಸಿದೆ"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"ಸಾಧನವು ಸಾಮಾನ್ಯಕ್ಕಿಂತ ಹೆಚ್ಚಿನದನ್ನು ಬಳಸಿದೆ"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"ಬ್ಯಾಟರಿ ಸಾಮಾನ್ಯ ಅವಧಿಗಿಂತ ಮೊದಲೇ ಖಾಲಿಯಾಗಬಹುದು"</string>
-    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"ಬ್ಯಾಟರಿಯ ಆರೋಗ್ಯಕ್ಕಾಗಿ ಆಪ್ಟಿಮೈಸ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"ಬ್ಯಾಟರಿಯ ಸುಸ್ಥಿತಿಗಾಗಿ ಆಪ್ಟಿಮೈಸ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"ಬ್ಯಾಟರಿಯನ್ನು ತಾತ್ಕಾಲಿಕವಾಗಿ ಸೀಮಿತಗೊಳಿಸಲಾಗಿದೆ. ಇನ್ನಷ್ಟು ತಿಳಿಯಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"ನಿಮ್ಮ ಫೋನ್‌ ಅನ್ನು ಸಾಮಾನ್ಯಕ್ಕಿಂತ ಹೆಚ್ಚು ಬಳಸಲಾಗಿದೆ. ನಿಮ್ಮ ಬ್ಯಾಟರಿಯು ನಿರೀಕ್ಷಿಸಿದ ಅವಧಿಗಿಂತ ಮುನ್ನವೇ ಖಾಲಿಯಾಗಬಹುದು.\n\nಬ್ಯಾಟರಿ ಬಳಕೆಯನ್ನು ಆಧರಿಸಿ ಇವುಗಳು ಟಾಪ್ ಆ್ಯಪ್‌ಗಳಾಗಿವೆ:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಸಾಮಾನ್ಯಕ್ಕಿಂತ ಹೆಚ್ಚು ಬಳಸಲಾಗಿದೆ. ನಿಮ್ಮ ಬ್ಯಾಟರಿಯು ನಿರೀಕ್ಷಿಸಿದ ಅವಧಿಗಿಂತ ಮುನ್ನವೇ ಖಾಲಿಯಾಗಬಹುದು.\n\nಬ್ಯಾಟರಿ ಬಳಕೆಯನ್ನು ಆಧರಿಸಿ ಇವುಗಳು ಟಾಪ್ ಆ್ಯಪ್‌ಗಳಾಗಿವೆ:"</string>
@@ -3075,10 +3073,15 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"ಬಳಕೆದಾರರನ್ನು ಅಳಿಸಿ"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"ಅಳಿಸಿ"</string>
     <string name="user_guest" msgid="4545590092001460388">"ಅತಿಥಿ"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"ಅತಿಥಿಯನ್ನು ತೆಗೆದುಹಾಕಿ"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"ಅತಿಥಿಯನ್ನು ತೆಗೆದುಹಾಕುವುದೇ?"</string>
+    <!-- no translation found for user_clear_guest_menu (4864362688187480452) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_menu (5064400453222497734) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_confirm_title (7526978959527761497) -->
+    <skip />
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"ಈ ಸೆಷನ್‌ನಲ್ಲಿನ ಎಲ್ಲ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"ತೆಗೆದುಹಾಕಿ"</string>
+    <!-- no translation found for user_exit_guest_dialog_remove (8095094235815676847) -->
+    <skip />
     <string name="user_enable_calling" msgid="264875360626905535">"ಫೋನ್ ಕರೆಗಳನ್ನು ಆನ್ ಮಾಡಿ"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"ಫೋನ್ ಕರೆಗಳು ಮತ್ತು ಎಸ್‌ಎಂಎಸ್‌ ಆನ್ ಮಾಡಿ"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"ಬಳಕೆದಾರರನ್ನು ಅಳಿಸಿ"</string>
@@ -3591,7 +3594,8 @@
     <string name="other_conversations" msgid="551178916855139870">"ಆದ್ಯತೆಯಲ್ಲದ ಸಂಭಾಷಣೆಗಳು"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"ನೀವು ಬದಲಾವಣೆ ಮಾಡಿದ ಸಂಭಾಷಣೆಗಳು"</string>
     <string name="recent_conversations" msgid="471678228756995274">"ಇತ್ತೀಚಿನ ಸಂಭಾಷಣೆಗಳು"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"ಇತ್ತೀಚಿನ ಸಂಭಾಷಣೆಗಳನ್ನು ತೆರವುಗೊಳಿಸಿ"</string>
+    <!-- no translation found for conversation_settings_clear_recents (4246342656145488662) -->
+    <skip />
     <string name="clear" msgid="5092178335409471100">"ತೆರವುಗೊಳಿಸಿ"</string>
     <string name="important_bubble" msgid="7911698275408390846">"ಬಬಲ್ ಗುರುತು ಮಾಡಿದ ಆದ್ಯತೆಯ ಸಂಭಾಷಣೆಗಳು"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"ಪುಲ್-ಡೌನ್ ಶೇಡ್‌ನ ಮೇಲ್ಭಾಗದಲ್ಲಿ ಆದ್ಯತೆಯ ಸಂಭಾಷಣೆಗಳನ್ನು ತೋರಿಸಲಾಗುವುದು. ನೀವು ಸಹ ಬಬಲ್ ಮತ್ತು \'ಅಡಚಣೆ ಮಾಡಬೇಡಿ\' ಮೋಡ್‌ಗೆ ಅಡ್ಡಿಪಡಿಸಲು ಅವುಗಳನ್ನು ಹೊಂದಿಸಬಹುದು."</string>
@@ -4424,7 +4428,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"ಹಲವು ಸಾಧನಗಳಿಗೆ ಸಂಪರ್ಕಿಸಲಾಗಿದೆ"</string>
     <string name="demo_mode" msgid="6566167465451386728">"ಸಿಸ್ಟಂ UI ಡೆಮೋ ಮೋಡ್"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"ಡಾರ್ಕ್ ಥೀಮ್"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"ಬ್ಯಾಟರಿ ಸೇವರ್ ಕಾರಣ ತಾತ್ಕಾಲಿಕವಾಗಿ ನಿಷ್ಕ್ರಿಯಗೊಂಡಿದೆ/ಆನ್ ಆಗಿದೆ"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"ಬ್ಯಾಟರಿ ಸೇವರ್ ಕಾರಣದಿಂದಾಗಿ ಆನ್ ಆಗಿದೆ"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"ಬೆಂಬಲಿತ ಆ್ಯಪ್‌ಗಳು ಸಹ ಡಾರ್ಕ್ ಥೀಮ್‌ಗೆ ಬದಲಾಗುತ್ತವೆ"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"ಅರ್ಥವಾಯಿತು"</string>
@@ -5063,15 +5068,34 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ಪ್ರಾಶಸ್ತ್ಯಗಳು"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ಸಾರ್ವಜನಿಕ ನೆಟ್‌ವರ್ಕ್‌ಗಳಿಗೆ ಕನೆಕ್ಟ್ ಮಾಡಿ"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ನೆಟ್‌ವರ್ಕ್ ಕನೆಕ್ಷನ್, ಇಂಟರ್ನೆಟ್, ವೈರ್‌ಲೆಸ್, ಡೇಟಾ, ವೈಫೈ, ವೈ-ಫೈ, ವೈ ಫೈ, ಸೆಲ್ಯುಲಾರ್, ಮೊಬೈಲ್, ಸೆಲ್ ವಾಹಕ, 4g, 3g, 2g, LTE"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"ಏರೋಪ್ಲೇನ್-ಸುರಕ್ಷಿತ ನೆಟ್‌ವರ್ಕ್ ನೋಡಿ"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್ ಆಫ್ ಮಾಡಿ"</string>
+    <!-- no translation found for view_airplane_safe_networks (9170023210981508906) -->
+    <skip />
+    <!-- no translation found for turn_off_airplane_mode (7141986366534514443) -->
+    <skip />
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"ಕನೆಕ್ಟ್ ಆಗಿದೆ"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"ಇಂಟರ್ನೆಟ್ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಕನೆಕ್ಟ್ ಆಗುವುದಿಲ್ಲ"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"ಇತರ ಯಾವುದೇ ನೆಟ್‌ವರ್ಕ್‌ಗಳು ಲಭ್ಯವಿಲ್ಲ"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"ಯಾವುದೇ ನೆಟ್‌ವರ್ಕ್‌ಗಳು ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"ಬೆಡ್‌ಟೈಮ್ ಮೋಡ್ ಆನ್ ಇರುವುದರಿಂದ ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"ಮರುಹೊಂದಿಕೆ ಅಧಿಸೂಚನೆ ಪ್ರಾಮುಖ್ಯತೆ ಪೂರ್ಣಗೊಂಡಿದೆ."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"ಆ್ಯಪ್‌ಗಳು"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"ವಿಶ್ವಾಸಾರ್ಹವಲ್ಲದ ಸಾಧನವು ನಿಮ್ಮ ಸಂದೇಶಗಳಿಗೆ ಪ್ರವೇಶಿಸಲು ಬಯಸುತ್ತದೆ. ವಿವರಗಳಿಗಾಗಿ ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"ಸಂದೇಶಗಳಿಗೆ ಪ್ರವೇಶವನ್ನು ಅನುಮತಿಸಬೇಕೇ?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"ಒಂದು ವಿಶ್ವಾಸಾರ್ಹವಲ್ಲದ ಬ್ಲೂಟೂತ್ ಸಾಧನ, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ನಿಮ್ಮ ಸಂದೇಶಗಳಿಗೆ ಪ್ರವೇಶಿಸಲು ಬಯಸುತ್ತದೆ.\n\nನೀವು ಈ ಮೊದಲು [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ಕ್ಕೆ ಸಂಪರ್ಕ ಹೊಂದಿರಲಿಲ್ಲ."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"ಒಂದು ವಿಶ್ವಾಸಾರ್ಹವಲ್ಲದ ಬ್ಲೂಟೂತ್ ಸಾಧನ, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, ನಿಮ್ಮ ಸಂದೇಶಗಳಿಗೆ ಪ್ರವೇಶಿಸಲು ಬಯಸುತ್ತದೆ.\n\nನೀವು ಈ ಮೊದಲು <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> ಗೆ ಕನೆಕ್ಟ್ ಆಗಿರಲಿಲ್ಲ."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"ವಿಶ್ವಾಸಾರ್ಹವಲ್ಲದ ಸಾಧನವು ನಿಮ್ಮ ಸಂಪರ್ಕಗಳು ಮತ್ತು ಕರೆಯ ಲಾಗ್‌ಗೆ ಪ್ರವೇಶಿಸಲು ಬಯಸುತ್ತದೆ. ವಿವರಗಳಿಗಾಗಿ ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"ಸಂಪರ್ಕಗಳು ಮತ್ತು ಕರೆಯ ಲಾಗ್‌ಗೆ ಪ್ರವೇಶಿಸಲು ಅನುಮತಿಸಬೇಕೇ?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"ಒಂದು ವಿಶ್ವಾಸಾರ್ಹವಲ್ಲದ ಬ್ಲೂಟೂತ್ ಸಾಧನ, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ನಿಮ್ಮ ಸಂಪರ್ಕಗಳು ಮತ್ತು ಕರೆಯ ಲಾಗ್‌ಗೆ ಪ್ರವೇಶಿಸಲು ಬಯಸುತ್ತದೆ. ಇದು ಒಳಬರುವ ಮತ್ತು ಹೊರಹೋಗುವ ಕರೆಗಳ ಡೇಟಾವನ್ನು ಒಳಗೊಂಡಿರುತ್ತದೆ.\n\nನೀವು ಈ ಮೊದಲು [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ಕ್ಕೆ ಸಂಪರ್ಕ ಹೊಂದಿರಲಿಲ್ಲ."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"ಒಂದು ವಿಶ್ವಾಸಾರ್ಹವಲ್ಲದ ಬ್ಲೂಟೂತ್ ಸಾಧನ, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, ನಿಮ್ಮ ಸಂಪರ್ಕಗಳು ಮತ್ತು ಕರೆಯ ಲಾಗ್‌ಗೆ ಪ್ರವೇಶಿಸಲು ಬಯಸುತ್ತದೆ. ಇದು ಒಳಬರುವ ಮತ್ತು ಹೊರಹೋಗುವ ಕರೆಗಳ ಡೇಟಾವನ್ನು ಒಳಗೊಂಡಿರುತ್ತದೆ.\n\nನೀವು ಈ ಮೊದಲು <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> ಗೆ ಕನೆಕ್ಟ್ ಆಗಿರಲಿಲ್ಲ."</string>
+    <!-- no translation found for category_name_brightness (8520372392029305084) -->
+    <skip />
+    <!-- no translation found for category_name_lock_display (7478785189102882266) -->
+    <skip />
+    <!-- no translation found for category_name_visibility (4485030512199246405) -->
+    <skip />
+    <!-- no translation found for category_name_color (937514550918977151) -->
+    <skip />
+    <!-- no translation found for category_name_others (2366006298768550310) -->
+    <skip />
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 098f6d2..968ed32 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"종료 시간"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"상태"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"강도"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"사용 안함/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"자동으로 켜지 않음"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"<xliff:g id="ID_1">%1$s</xliff:g>에 자동으로 켜짐"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"일몰에 자동으로 켜짐"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"켬/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"자동으로 끄지 않음"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"<xliff:g id="ID_1">%1$s</xliff:g>에 자동으로 꺼짐"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"일출에 자동으로 꺼짐"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"일몰부터 일출까지 켜짐"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"맞춤 시간에 켜기"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"상태"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"꺼짐/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"자동으로 켜지 않음"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"일몰에 자동으로 켜짐"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"<xliff:g id="ID_1">%1$s</xliff:g>에 자동으로 켜짐"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"켜짐/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"자동으로 끄지 않음"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"일출에 자동으로 끄기"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"<xliff:g id="ID_1">%1$s</xliff:g>에 자동으로 꺼짐"</string>
@@ -1613,7 +1609,7 @@
     <string name="reset_network_desc" msgid="1112523764899788246">"다음을 포함한 모든 네트워크 설정이 초기화됩니다.\n\n"<li>"Wi‑Fi"</li>\n<li>"모바일 데이터"</li>\n<li>"블루투스"</li></string>
     <string name="erase_euicc_data_button" msgid="728078969563311737">"삭제"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"다운로드한 SIM 삭제"</string>
-    <string name="reset_esim_desc" msgid="3662444090563399131">"이렇게 해도 모바일 서비스 요금제는 취소되지 않습니다. 교체 SIM을 다운로드하려면 이동통신사에 문의하세요."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"SIM을 삭제해도 모바일 서비스 요금제는 취소되지 않습니다. 교체 SIM을 다운로드하려면 이동통신사에 문의하세요."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"설정 초기화"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"네트워크 설정을 모두 초기화하시겠습니까? 이 작업은 실행취소할 수 없습니다."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"모든 네트워크 설정을 초기화하고 다운로드한 SIM을 삭제하시겠습니까? 이 작업은 실행취소할 수 없습니다."</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"스크린 리더"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"오디오 및 화면에 있는 텍스트"</string>
     <string name="display_category_title" msgid="6638191682294461408">"디스플레이"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"상호작용 관리"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"다운로드한 앱"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"실험"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"사용자 삭제"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"삭제"</string>
     <string name="user_guest" msgid="4545590092001460388">"게스트"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"게스트 삭제"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"게스트를 삭제하시겠습니까?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"게스트 데이터 삭제"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"게스트 세션 종료"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"게스트 세션을 종료하시겠습니까?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"이 세션에 있는 모든 앱과 데이터가 삭제됩니다."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"삭제"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"세션 종료"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"통화 기능 사용"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"통화 및 SMS 기능 사용"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"사용자 삭제"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"우선순위가 아닌 대화"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"변경한 대화"</string>
     <string name="recent_conversations" msgid="471678228756995274">"최근 대화"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"최근 항목 삭제"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"최근 항목 모두 삭제"</string>
     <string name="clear" msgid="5092178335409471100">"삭제"</string>
     <string name="important_bubble" msgid="7911698275408390846">"우선순위 대화를 버블로 설정"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"우선순위 대화는 풀다운 창 상단에 표시됩니다. 버블로 설정하여 방해 금지 모드를 무시하도록 할 수도 있습니다."</string>
@@ -3828,7 +3827,7 @@
     <string name="zen_mode_reminders_list_first" msgid="1130470396012190814">"리마인더"</string>
     <string name="zen_mode_events" msgid="7425795679353531794">"캘린더 일정"</string>
     <string name="zen_mode_events_summary" msgid="3241903481309766428">"예정된 캘린더 일정"</string>
-    <string name="zen_mode_events_list" msgid="7191316245742097229">"이벤트"</string>
+    <string name="zen_mode_events_list" msgid="7191316245742097229">"일정"</string>
     <string name="zen_mode_events_list_first" msgid="7425369082835214361">"일정"</string>
     <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"앱에서 무시하도록 허용"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"예외 앱"</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"여러 기기에 연결됨"</string>
     <string name="demo_mode" msgid="6566167465451386728">"시스템 UI 데모 모드"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"어두운 테마"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"사용 / 절전 모드로 인해 일시적으로 사용 중지됨"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"절전 모드로 인해 일시적으로 사용 중지됨"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"지원되는 앱도 어두운 테마로 전환됩니다."</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"확인"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"환경설정"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"공용 네트워크에 연결"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"네트워크 연결, 인터넷, 무선, 데이터, Wifi, Wi-Fi, Wi Fi, 셀룰러, 모바일, 이동통신사, 4G, 3G, 2G, LTE"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"항공 안전 네트워크 보기"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"비행기 모드 사용 중지"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"비행기 모드 네트워크 보기"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"비행기 모드 사용 중지"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"연결됨"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"인터넷에 자동으로 연결되지 않음"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"사용 가능한 다른 네트워크가 없음"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"사용 가능한 네트워크가 없음"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"취침 모드가 켜져 있으므로 사용할 수 없습니다."</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"알림 중요도가 재설정되었습니다."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"앱"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"신뢰할 수 없는 기기에서 메시지에 액세스하려고 합니다. 세부정보를 확인하려면 탭하세요."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"메시지 액세스를 허용하시겠습니까?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"신뢰할 수 없는 블루투스 기기 [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]에서 메시지에 액세스하려고 합니다.\n\n전에는 [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]에 연결한 적이 없습니다."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"신뢰할 수 없는 블루투스 기기 <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>에서 메시지에 액세스하려고 합니다.\n\n전에는 <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>에 연결한 적이 없습니다."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"신뢰할 수 없는 기기에서 연락처와 통화 기록에 액세스하려고 합니다. 세부정보를 확인하려면 탭하세요."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"연락처와 통화 기록 액세스를 허용하시겠습니까?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"신뢰할 수 없는 블루투스 기기 [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]에서 연락처와 통화 기록에 액세스하려고 합니다. 여기에는 수신 전화와 발신 전화에 관한 데이터도 포함됩니다.\n\n전에는 [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]에 연결한 적이 없습니다."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"신뢰할 수 없는 블루투스 기기 <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>에서 연락처와 통화 기록에 액세스하려고 합니다. 여기에는 수신 전화와 발신 전화에 관한 데이터도 포함됩니다.\n\n전에는 <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>에 연결한 적이 없습니다."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"밝기"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"잠금 화면"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"표시 상태"</string>
+    <string name="category_name_color" msgid="937514550918977151">"색상"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"기타"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 709f21d..f578e37 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Качан аяктайт"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Абалы"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Жарыктыгы"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Өчүк / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Эч качан автоматтык түрдө күйбөйт"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"<xliff:g id="ID_1">%1$s</xliff:g> болгондо автоматтык түрдө күйөт"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Күн батканда автоматтык түрдө күйөт"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Күйүк / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Эч качан автоматтык түрдө өчпөйт"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"<xliff:g id="ID_1">%1$s</xliff:g> болгондо автоматтык түрдө өчөт"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Күн чыкканда автоматтык түрдө өчөт"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Күн баткандан чыкканга чейин"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Белгиленген убакта күйөт"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Абалы"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Өчүк / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Эч качан автоматтык түрдө күйбөйт"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Күн батканда автоматтык түрдө күйөт"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"<xliff:g id="ID_1">%1$s</xliff:g> болгондо автоматтык түрдө күйөт"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Күйүк / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Эч качан автоматтык түрдө өчпөйт"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Күн чыкканда автоматтык түрдө өчөт"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"<xliff:g id="ID_1">%1$s</xliff:g> болгондо автоматтык түрдө өчөт"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Экрандагыны окугучтар"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Аудио жана текстти окуп берүү"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Экран"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Башкаруу элементтери"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Жүктөлүп алынган колдонмолор"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Сынамык"</string>
@@ -3075,10 +3073,15 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Колдонуучуну жок кылуу"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Жок кылуу"</string>
     <string name="user_guest" msgid="4545590092001460388">"Конок"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Конокту алып салуу"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Конокту алып саласызбы?"</string>
+    <!-- no translation found for user_clear_guest_menu (4864362688187480452) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_menu (5064400453222497734) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_confirm_title (7526978959527761497) -->
+    <skip />
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Бул сеанстагы бардык колдонмолор жана дайындар өчүрүлөт."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Алып салуу"</string>
+    <!-- no translation found for user_exit_guest_dialog_remove (8095094235815676847) -->
+    <skip />
     <string name="user_enable_calling" msgid="264875360626905535">"Телефон чалууларын иштетүү"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Чалуулар менен SMS иштетүү"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Колдонуучуну жок кылуу"</string>
@@ -3591,7 +3594,8 @@
     <string name="other_conversations" msgid="551178916855139870">"Маанилүү эмес жазышуулар"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Өзгөрүү киргизилген жазышуулар"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Акыркы жазышуулар"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Акыркыларды тазалоо"</string>
+    <!-- no translation found for conversation_settings_clear_recents (4246342656145488662) -->
+    <skip />
     <string name="clear" msgid="5092178335409471100">"Тазалоо"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Маанилүү жазышууларды калкып чыкма билдирмелерде көрсөтүү"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Маанилүү жазышуулар билдирмелер тактасынын жогору жагында көрүнөт. Ошондой эле аларды калкып чыкма билдирмелер түрүнө \"Тынчымды алба\" режиминде көрсөтүлгөндөй кылып жөндөй аласыз."</string>
@@ -4424,7 +4428,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Бир нече түзмөккө туташты"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Тутум интерфейсинин демо режими"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Караңгы тема"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Күйүк / Батареяны үнөмдөгүч режиминде убактылуу өчүрүлдү"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Батареяны үнөмдөгүч режиминде убактылуу күйгүзүлдү"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Ушул функция каралган колдонмолор да караңгы темага которулушат"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Түшүндүм"</string>
@@ -5063,15 +5068,34 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Жеке жөндөөлөр"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Жалпыга ачык тармактарга туташуу"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"тармакка туташуу, интернет, зымсыз, маалымат, wifi, wi-fi, wi fi, уюлдук, мобилдик, байланыш оператору, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Учактагы коопсуз тармактарды көрүү"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Учак режимин өчүрүү"</string>
+    <!-- no translation found for view_airplane_safe_networks (9170023210981508906) -->
+    <skip />
+    <!-- no translation found for turn_off_airplane_mode (7141986366534514443) -->
+    <skip />
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Туташты"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Интернет автоматтык түрдө туташпайт"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Башка тармактар жеткиликсиз"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Тармактар жеткиликтүү эмес"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Уйку режиминде иштебейт"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Билдирмелердин маанилүүлүгүн баштапкы абалга келтирүү аяктады."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Колдонмолор"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Кооптуу түзмөк билдирүүлөрүңүздү көргөнү жатат. Чоо-жайын көрүү үчүн таптап коюңуз."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Билдирүүлөрдү көрүүгө уруксат берилсинби?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Кооптуу Bluetooth түзмөгү, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], билдирүүлөрүңүздү көргөнү жатат.\n\n[<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] түзмөгүнө буга чейин туташкан эмессиз."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Кооптуу Bluetooth түзмөгү, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, билдирүүлөрүңүздү көргөнү жатат.\n\n<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> түзмөгүнө буга чейин туташкан эмессиз."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Кооптуу түзмөк байланыштарыңызды жана чалуулар тизмесин көргөнү жатат. Чоо-жайын көрүү үчүн таптап коюңуз."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Байланыштар менен чалуулар тизмесин көрүүгө уруксат берилсинби?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Кооптуу Bluetooth түзмөгү, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], байланыштарыңызды жана чалуулар тизмесин көргөнү жатат. Буга кирүүчү жана чыгуучу чалуулар кирет.\n\n[<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] түзмөгүнө буга чейин туташкан эмессиз."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Кооптуу Bluetooth түзмөгү, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, байланыштарыңызды жана чалуулар тизмесин көргөнү жатат. Буга кирүүчү жана чыгуучу чалуулар кирет.\n\n<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> түзмөгүнө буга чейин туташкан эмессиз."</string>
+    <!-- no translation found for category_name_brightness (8520372392029305084) -->
+    <skip />
+    <!-- no translation found for category_name_lock_display (7478785189102882266) -->
+    <skip />
+    <!-- no translation found for category_name_visibility (4485030512199246405) -->
+    <skip />
+    <!-- no translation found for category_name_color (937514550918977151) -->
+    <skip />
+    <!-- no translation found for category_name_others (2366006298768550310) -->
+    <skip />
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 1f97968..f90d817 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"ເວລາສິ້ນສຸດ"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"ສະຖານະ"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"ຄວາມເຂັ້ມຂຸ້ນ"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"ປິດ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"ຈະບໍ່ເປີດອັດຕະໂນມັດ"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"ຈະເປີດອັດຕະໂນມັດເວລາ <xliff:g id="ID_1">%1$s</xliff:g>."</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"ຈະເປີດອັດຕະໂນມັດເມື່ອຕາເວັນຕົກ"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"ເປີດ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"ຈະບໍ່ປິດອັດຕະໂນມັດ"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"ຂະປິດອັດຕະໂນມັດເວລາ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"ຈະປິດອັດຕະໂນມັດເມື່ອຕາເວັນຂຶ້ນ"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"ເປີດນັບແຕ່ຕາເວັນຕົກຮອດຕາເວັນຂຶ້ນ"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"ເປີດໃຊ້ໃນເວລາທີ່ກຳນົດເອງ"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"ສະຖານະ"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"ປິດ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"ຈະບໍ່ເປີດອັດຕະໂນມັດ"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"ຈະເປີດອັດຕະໂນມັດເມື່ອຕາເວັນຕົກ"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"ຈະເປີດອັດຕະໂນມັດເວລາ <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"ເປີດ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"ຈະບໍ່ປິດອັດຕະໂນມັດ"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"ຈະປິດອັດຕະໂນມັດເມື່ອຕາເວັນຂຶ້ນ"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"ຂະປິດອັດຕະໂນມັດເວລາ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"ຕົວອ່ານໜ້າຈໍ"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ສຽງ ແລະ ຂໍ້ຄວາມໜ້າຈໍ"</string>
     <string name="display_category_title" msgid="6638191682294461408">"ການສະແດງຜົນ"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"ການຄວບຄຸມການໂຕ້ຕອບ"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"ແອັບທີ່ດາວໂຫຼດແລ້ວ"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"ຍັງຢູ່ໃນການທົດລອງ"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"ລຶບຜູ່ໃຊ້"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"ລຶບ"</string>
     <string name="user_guest" msgid="4545590092001460388">"ແຂກ"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"​ລຶບ​ແຂກ"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"ລຶບ​ແຂກ?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"ລຶບລ້າງຂໍ້ມູນແຂກ"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"ສິ້ນສຸດເຊດຊັນແຂກ"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"ສິ້ນສຸດເຊດຊັນແຂກບໍ?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"​ແອັບຯ​ແລະ​ຂໍ້​ມູນ​ທັງ​ໝົດ​ໃນ​ເຊດ​ຊັນ​ນີ້​ຈະ​ຖືກ​ລຶບ​ອອກ."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"ລຶບ​"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"ສິ້ນສຸດເຊດຊັນ"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"ເປີດ​ການໂທ​"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"ເປີດ​ໂທ​ລະ​ສັບ ແລະ SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"ລຶບຜູ້ໃຊ້"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"ການສົນທະນາທີ່ບໍ່ສຳຄັນ"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"ການສົນທະນາທີ່ທ່ານປ່ຽນແປງ"</string>
     <string name="recent_conversations" msgid="471678228756995274">"ການສົນທະນາຫຼ້າສຸດ"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"ລຶບລ້າງອັນຫຼ້າສຸດ"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"ລຶບລ້າງອັນຫຼ້າສຸດອອກໝົດ"</string>
     <string name="clear" msgid="5092178335409471100">"ລຶບລ້າງ"</string>
     <string name="important_bubble" msgid="7911698275408390846">"ຕັ້ງການສົນທະນາສຳຄັນເປັນ Bubble"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"ການສົນທະນາສຳຄັນຈະສະແດງຢູ່ເທິງສຸດຂອງແຖບແບບເລື່ອນລົງ. ນອກຈາກນັ້ນ, ທ່ານຍັງສາມາດຕັ້ງໃຫ້ພວກມັນສະແດງເປັນ Bubble ແລະ ລົບກວນໂໝດຫ້າມລົບກວນໄດ້ນຳ."</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"ເຊື່ອມຕໍ່ຫາຫຼາຍອຸປະກອນ"</string>
     <string name="demo_mode" msgid="6566167465451386728">"ໂໝດເດໂມສ່ວນຕິດຕໍ່ຜູ້ໃຊ້ລະບົບ"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"ຮູບແບບສີສັນມືດ"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"ເປີດ / ປິດໄວ້ຊົ່ວຄາວເນື່ອງຈາກຕົວປະຢັດແບັດເຕີຣີ"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"ເປີດໃຊ້ຊົ່ວຄາວເນື່ອງຈາກຕົວປະຢັດແບັດເຕີຣີ"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"ແອັບທີ່ຮອງຮັບຈະຖືກສະຫຼັບໄປໃຊ້ຮູບແບບສີສັນມືດນຳ"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"ເຂົ້າໃຈແລ້ວ"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ການຕັ້ງຄ່າ"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ເຊື່ອມຕໍ່ຫາເຄືອຂ່າຍສາທາລະນະ"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ການເຊື່ອມຕໍ່ເຄືອຂ່າຍ, ອິນເຕີເນັດ, ໄຮ້ສາຍ, ອິນເຕີເນັດມືຖື, wifi, wi-fi, wi fi, ເຄືອຂ່າຍທືຖື, ມືຖື, ຜູ້ໃຫ້ບໍລິການມືຖື, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"ເບິ່ງເຄືອຂ່າຍທີ່ປອດໄພສຳລັບຍົນ"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"ປິດໂໝດຢູ່ໃນຍົນ"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"ເບິ່ງເຄືອຂ່າຍໂໝດຢູ່ໃນຍົນ"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"ປິດໂໝດຢູ່ໃນຍົນ"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"ເຊື່ອມຕໍ່ແລ້ວ"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"ຈະບໍ່ເຊື່ອມຕໍ່ອິນເຕີເນັດ"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"ບໍ່ມີເຄືອຂ່າຍອື່ນທີ່ສາມາດໃຊ້ໄດ້"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"ບໍ່​ມ​ີ​ເຄືອ​ຂ່າຍ​ທີ່​ສາ​ມາດ​ໃຊ້​ໄດ້"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"ບໍ່ສາມາດໃຊ້ໄດ້ເນື່ອງຈາກເປີດໂໝດເວລານອນຢູ່"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"ຣີເຊັດຄວາມສຳຄັນການແຈ້ງເຕືອນສຳເລັດແລ້ວ."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"ແອັບ"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"ມີອຸປະກອນທີ່ບໍ່ເຊື່ອຖືຕ້ອງການເຂົ້າເຖິງຂໍ້ຄວາມຂອງທ່ານ. ແຕະເພື່ອເບິ່ງລາຍລະອຽດ."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"ອະນຸຍາດການເຂົ້າເຖິງຂໍ້ຄວາມບໍ?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"ອຸປະກອນ Bluetooth ທີ່ບໍ່ເຊື່ອຖື, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ຕ້ອງການເຂົ້າເຖິງຂໍ້ຄວາມຂອງທ່ານ.\n\nທ່ານບໍ່ເຄີຍເຊື່ອມຕໍ່ຫາ [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ມາກ່ອນ."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"ອຸປະກອນ Bluetooth ທີ່ບໍ່ເຊື່ອຖື, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, ຕ້ອງການເຂົ້າເຖິງຂໍ້ຄວາມຂອງທ່ານ.\n\nທ່ານບໍ່ເຄີຍເຊື່ອມຕໍ່ຫາ <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> ມາກ່ອນ."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"ມີອຸປະກອນທີ່ບໍ່ເຊື່ອຖືຕ້ອງການເຂົ້າເຖິງລາຍຊື່ຜູ້ຕິດຕໍ່ ແລະ ບັນທຶກການໂທຂອງທ່ານ. ແຕະເພື່ອເບິ່ງລາຍລະອຽດ."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"ອະນຸຍາດການເຂົ້າເຖິງລາຍຊື່ຜູ້ຕິດຕໍ່ ແລະ ບັນທຶກການໂທບໍ?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"ອຸປະກອນ Bluetooth ທີ່ບໍ່ເຊື່ອຖື, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ຕ້ອງການເຂົ້າເຖິງລາຍຊື່ຜູ້ຕິດຕໍ່ ແລະ ບັນທຶກການໂທຂອງທ່ານ. ນີ້ຮວມເຖິງຂໍ້ມູນກ່ຽວກັບການໂທເຂົ້າ ແລະ ໂທອອກນຳ.\n\nທ່ານບໍ່ເຄີຍເຊື່ອມຕໍ່ຫາ [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ມາກ່ອນ."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"ອຸປະກອນ Bluetooth ທີ່ບໍ່ເຊື່ອຖື, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, ຕ້ອງການເຂົ້າເຖິງລາຍຊື່ຜູ້ຕິດຕໍ່ ແລະ ບັນທຶກການໂທຂອງທ່ານ. ນີ້ຮວມເຖິງຂໍ້ມູນກ່ຽວກັບການໂທເຂົ້າ ແລະ ໂທອອກນຳ.\n\nທ່ານບໍ່ເຄີຍເຊື່ອມຕໍ່ຫາ <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> ມາກ່ອນ."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"ຄວາມສະຫວ່າງ"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"ລັອກໜ້າຈໍ"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"ການແບ່ງປັນ"</string>
+    <string name="category_name_color" msgid="937514550918977151">"ສີ"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"ອື່ນໆ"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index f18d429..55ef0ee 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -1269,11 +1269,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Pabaigos laikas"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Būsena"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intensyvumas"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Išjungta / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Niekada nebus įjungta automatiškai"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Bus įjungta automatiškai <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Bus įjungta automatiškai saulei leidžiantis"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Įjungta / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Niekada nebus išjungta automatiškai"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Bus išjungta automatiškai <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Bus išjungta automatiškai saulei tekant"</string>
@@ -1296,11 +1294,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Įjungta nuo saulėl. iki saulėt."</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Įjungiama pasirinktu laiku"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Būsena"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Išjungta / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Niekada nebus įjungta automatiškai"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Bus įjungta automatiškai saulei leidžiantis"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Bus įjungta automatiškai <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Įjungta / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Niekada nebus išjungta automatiškai"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Bus išjungta automatiškai saulei tekant"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Bus išjungta automatiškai <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2184,6 +2180,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Ekrano skaitytuvai"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Garsas ir tekstas ekrane"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Ekranas"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Sąveikos valdikliai"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Atsisiųstos programos"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Eksperimentinė versija"</string>
@@ -3161,10 +3159,15 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Ištrinti naudotoją"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Ištrinti"</string>
     <string name="user_guest" msgid="4545590092001460388">"Svečias"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Pašalinti svečią"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Pašalinti svečią?"</string>
+    <!-- no translation found for user_clear_guest_menu (4864362688187480452) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_menu (5064400453222497734) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_confirm_title (7526978959527761497) -->
+    <skip />
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Bus ištrintos visos šios sesijos programos ir duomenys."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Pašalinti"</string>
+    <!-- no translation found for user_exit_guest_dialog_remove (8095094235815676847) -->
+    <skip />
     <string name="user_enable_calling" msgid="264875360626905535">"Įjungti telefono skambučius"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Įjungti telefono skambučius ir SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Naudotojo ištrynimas"</string>
@@ -3681,7 +3684,8 @@
     <string name="other_conversations" msgid="551178916855139870">"Ne prioritetiniai pokalbiai"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Pakeisti pokalbiai"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Paskutiniai pokalbiai"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Išvalyti naujausius"</string>
+    <!-- no translation found for conversation_settings_clear_recents (4246342656145488662) -->
+    <skip />
     <string name="clear" msgid="5092178335409471100">"Išvalyti"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Rodyti svarbiausių pokalbių debesėlius"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Svarbiausi pokalbiai rodomi išskleidžiamojo skydelio viršuje. Taip pat galite nustatyti, kad jie būtų rodomi debesėliuose ir pertrauktų netrukdymo režimą."</string>
@@ -4564,7 +4568,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Prisijungta prie kelių įrenginių"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Sistemos NS demonstracinis režimas"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Tamsioji tema"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Įjungta / laikinai išjungta dėl akum. tausojimo priemonės"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Laikinai išjungta dėl akumuliatoriaus tausojimo priemonės"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Palaikomose programose taip pat bus įjungta tamsioji tema"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Supratau"</string>
@@ -5229,15 +5234,34 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Nuostatos"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Prisijungti prie viešųjų tinklų"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"tinklo ryšys, internetas, belaidis ryšys, duomenys, „Wifi“, „Wi-Fi“, „Wi Fi“, mobilusis ryšys, mobilusis, mobiliojo ryšio operatorius, 4G, 3G, 2G, LTE"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Žr. tinklus, kuriais saugu naudotis lėktuvuose"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Išjungti lėktuvo režimą"</string>
+    <!-- no translation found for view_airplane_safe_networks (9170023210981508906) -->
+    <skip />
+    <!-- no translation found for turn_off_airplane_mode (7141986366534514443) -->
+    <skip />
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Prisijungta"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Prie interneto nebus jungiamasi automatiškai"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Nėra kitų pasiekiamų tinklų"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Nėra pasiekiamų tinklų"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Nepasiekiama, nes įjungtas laiko eiti miegoti režimas"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Pranešimų svarba nustatyta iš naujo."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Programos"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Nepatikimas įrenginys nori pasiekti jūsų pranešimus. Palieskite, jei reikia išsamios informacijos."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Leisti pasiekti pranešimus?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Nepatikimas „Bluetooth“ įrenginys „<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>“ nori pasiekti jūsų pranešimus.\n\nPrie „<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>“ dar niekada nebuvote prisijungę."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Nepatikimas „Bluetooth“ įrenginys „<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>“ nori pasiekti jūsų pranešimus.\n\nPrie „<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>“ dar niekada nebuvote prisijungę."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Nepatikimas įrenginys nori pasiekti jūsų kontaktus ir skambučių žurnalą. Palieskite, jei reikia išsamios informacijos."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Leisti pasiekti kontaktus ir skambučių žurnalą?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Nepatikimas „Bluetooth“ įrenginys „<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>“ nori pasiekti jūsų kontaktus ir skambučių žurnalą. Tai apima duomenis apie gaunamuosius ir siunčiamuosius skambučius.\n\nPrie „<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>“ dar niekada nebuvote prisijungę."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Nepatikimas „Bluetooth“ įrenginys „<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>“ nori pasiekti jūsų kontaktus ir skambučių žurnalą. Tai apima duomenis apie gaunamuosius ir siunčiamuosius skambučius.\n\nPrie „<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>“ dar niekada nebuvote prisijungę."</string>
+    <!-- no translation found for category_name_brightness (8520372392029305084) -->
+    <skip />
+    <!-- no translation found for category_name_lock_display (7478785189102882266) -->
+    <skip />
+    <!-- no translation found for category_name_visibility (4485030512199246405) -->
+    <skip />
+    <!-- no translation found for category_name_color (937514550918977151) -->
+    <skip />
+    <!-- no translation found for category_name_others (2366006298768550310) -->
+    <skip />
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index be467ed..ad5e2ce 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -1249,11 +1249,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Beigu laiks"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Statuss"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intensitāte"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Izslēgts/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Nekad netiks automātiski ieslēgts"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Tiks automātiski ieslēgts plkst. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Tiks automātiski ieslēgts saulrietā"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Ieslēgts/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Nekad netiks automātiski izslēgts"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Tiks automātiski izslēgts plkst. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Tiks automātiski izslēgts saullēktā"</string>
@@ -1276,11 +1274,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Ieslēgts no rieta līdz lēktam"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Tiek ieslēgts pielāgotā laikā"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Statuss"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Izslēgts/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Nekad netiks automātiski ieslēgts"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Tiks automātiski ieslēgts saulrietā"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Tiks automātiski ieslēgts plkst. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Ieslēgts/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Nekad netiks automātiski izslēgts"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Tiks automātiski izslēgts saullēktā"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Tiks automātiski izslēgts plkst. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -1633,7 +1629,7 @@
     <string name="reset_network_title" msgid="1395494440355807616">"Atiestatīt Wi-Fi, mobilo datu un Bluetooth iestatījumus"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Tādējādi tiks atiestatīti visi tīkla iestatījumi, tostarp:\n\n"<li>"Wi‑Fi;"</li>\n<li>"mobilie dati;"</li>\n<li>"Bluetooth."</li></string>
     <string name="erase_euicc_data_button" msgid="728078969563311737">"Dzēst"</string>
-    <string name="reset_esim_title" msgid="6152167073280852849">"Dzēst lejupielādētās SIM k."</string>
+    <string name="reset_esim_title" msgid="6152167073280852849">"Dzēst lejupielādētās SIM kartes"</string>
     <string name="reset_esim_desc" msgid="3662444090563399131">"Ar šo darbību netiks anulēti mobilo sakaru pakalpojumu plāni. Lai lejupielādētu nomaiņas SIM kartes, sazinieties ar mobilo sakaru operatoru."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Atiestatīt iestatījumus"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Vai vēlaties atiestatīt visus tīkla iestatījumus? Šo darbību nevar atsaukt."</string>
@@ -2160,6 +2156,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Ekrāna lasītāji"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio un ekrānā redzamais teksts"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Attēlojums"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Mijiedarbības vadīklas"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Lejupielādētās lietotnes"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Eksperimentāla"</string>
@@ -3118,10 +3116,15 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Dzēst lietotāju"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Dzēst"</string>
     <string name="user_guest" msgid="4545590092001460388">"Viesis"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Noņemt viesi"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Vai noņemt viesi?"</string>
+    <!-- no translation found for user_clear_guest_menu (4864362688187480452) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_menu (5064400453222497734) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_confirm_title (7526978959527761497) -->
+    <skip />
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Tiks dzēstas visas šīs sesijas lietotnes un dati."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Noņemt"</string>
+    <!-- no translation found for user_exit_guest_dialog_remove (8095094235815676847) -->
+    <skip />
     <string name="user_enable_calling" msgid="264875360626905535">"Ieslēgt tālruņa zvanus"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Ieslēgt tālruņa zvanus un īsziņas"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Dzēst lietotāju"</string>
@@ -3636,7 +3639,8 @@
     <string name="other_conversations" msgid="551178916855139870">"Sarunas, kas nav prioritāras"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Sarunas, kurās esat veicis izmaiņas"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Jaunākās sarunas"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Notīrīt nesenos"</string>
+    <!-- no translation found for conversation_settings_clear_recents (4246342656145488662) -->
+    <skip />
     <string name="clear" msgid="5092178335409471100">"Notīrīt"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Rādīt burbulī prioritārās sarunas"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Prioritārās sarunas tiek rādītas nolaižamā paneļa augšdaļā. Varat iestatīt, lai tās tiktu rādītas burbulī un režīmā “Netraucēt”."</string>
@@ -4494,7 +4498,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Izveidots savienojums ar vairākām ierīcēm"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Sistēmas lietotāja saskarnes demonstrācijas režīms"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Tumšais motīvs"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Ieslēgts/īslaicīgi atspējots enerģijas taupīšanas dēļ"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Īslaicīgi ieslēgts akumulatora enerģijas taupīšanas dēļ"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Arī lietotnes, kas atbalsta šo režīmu, tiks pārslēgtas uz tumšo motīvu"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Labi"</string>
@@ -5146,15 +5151,34 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferences"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Izveidot savienojumu ar publiskiem tīkliem"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"tīkla savienojums, internets, bezvadu, dati, Wi-Fi, mobilais tīkls, mobilie sakari, mobilo sakaru operators, 4G, 3G, 2G, LTE"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Skatīt tīklus, kas droši lidojuma režīmā"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Izslēgt lidojuma režīmu"</string>
+    <!-- no translation found for view_airplane_safe_networks (9170023210981508906) -->
+    <skip />
+    <!-- no translation found for turn_off_airplane_mode (7141986366534514443) -->
+    <skip />
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Ir izveidots savienojums"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Interneta savienojums netiks izveidots automātiski"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Nav pieejams neviens cits tīkls"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Nav pieejams neviens tīkls"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Šī preference nav pieejama, jo ir ieslēgts naktsmiera režīms."</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Paziņojumu svarīguma līmeņa atiestatīšana ir pabeigta."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Lietotnes"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Ierīce, kas nav saglabāta uzticamo ierīču sarakstā, pieprasa atļauju piekļūt jūsu ziņojumiem. Pieskarieties, lai skatītu detalizētu informāciju."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Vai atļaujat piekļūt ziņojumiem?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Bluetooth ierīce [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], kas nav saglabāta uzticamo ierīču sarakstā, pieprasa atļauju piekļūt jūsu ziņojumiem.\n\nJūs neesat iepriekš veidojis savienojumu ar ierīci [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Bluetooth ierīce (<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>), kas nav saglabāta uzticamo ierīču sarakstā, pieprasa atļauju piekļūt jūsu ziņojumiem.\n\nJūs iepriekš neesat izveidojis savienojumu ar ierīci “<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>”."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Ierīce, kas nav saglabāta uzticamo ierīču sarakstā, pieprasa atļauju piekļūt jūsu kontaktpersonu datiem un zvanu žurnālam. Pieskarieties, lai skatītu detalizētu informāciju."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Vai atļaujat piekļūt kontaktpersonu datiem un zvanu žurnālam?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Bluetooth ierīce [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], kas nav saglabāta uzticamo ierīču sarakstā, pieprasa atļauju piekļūt jūsu kontaktpersonu datiem un zvanu žurnālam. Tas attiecas arī uz datiem par ienākošajiem un izejošajiem zvaniem.\n\nJūs neesat iepriekš veidojis savienojumu ar ierīci [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Bluetooth ierīce (<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>), kas nav saglabāta uzticamo ierīču sarakstā, pieprasa atļauju piekļūt jūsu kontaktpersonu datiem un zvanu žurnālam. Tas attiecas arī uz datiem par ienākošajiem un izejošajiem zvaniem.\n\nJūs iepriekš neesat izveidojis savienojumu ar ierīci “<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>”."</string>
+    <!-- no translation found for category_name_brightness (8520372392029305084) -->
+    <skip />
+    <!-- no translation found for category_name_lock_display (7478785189102882266) -->
+    <skip />
+    <!-- no translation found for category_name_visibility (4485030512199246405) -->
+    <skip />
+    <!-- no translation found for category_name_color (937514550918977151) -->
+    <skip />
+    <!-- no translation found for category_name_others (2366006298768550310) -->
+    <skip />
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 9c58cde..312f796 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Време на завршување"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Статус"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Интензитет"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Исклучено/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Никогаш нема да се вклучи автоматски"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Ќе се вклучи автоматски во <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Ќе се вклучи автоматски на зајдисонце"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Вклучено/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Никогаш нема да се исклучи автоматски"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Ќе се исклучи автоматски во <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Ќе се исклучи автоматски на изгрејсонце"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Од зајдисонце до изгрејсонце"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Се вклучува во одредено време"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Статус"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Исклучено/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Никогаш нема да се вклучи автоматски"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Ќе се вклучи автоматски на зајдисонце"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Ќе се вклучи автоматски во <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Вклучено/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Никогаш нема да се исклучи автоматски"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Ќе се исклучи автоматски на изгрејсонце"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Ќе се исклучи автоматски во <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Читачи на екран"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Аудио и текст на екранот"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Приказ"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Контроли за интеракција"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Преземени апликации"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Експериментално"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Избриши корисник"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Избриши"</string>
     <string name="user_guest" msgid="4545590092001460388">"Гостин"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Отстрани гостин"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Да се отстрани гостинот?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Избриши ги податоците за гостинот"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Заврши ја гостинската сесија"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Да се заврши гостинската сесија?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Сите апликации и податоци во сесијата ќе се избришат."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Отстрани"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Заврши ја сесијата"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Вклучи телефонски повици"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Вклучи телефонски повици и SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Избриши корисник"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Неприоритетни разговори"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Разговори за кои сте извршиле промени"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Скорешни разговори"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Избриши скорешни"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Избриши ги последните"</string>
     <string name="clear" msgid="5092178335409471100">"Избриши"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Стави ги приоритетните разговори во балонче"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Приоритетните разговори се прикажуваат на горниот дел од списокот со известувања. Може да ги поставите и во балонче и да ја прекинуваат „Не вознемирувај“."</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Поврзан со повеќе уреди"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Демо-режим на кориснички интерфејс на систем"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Темна тема"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Вклучено/привремено оневозможена поради Штедачот на батерија"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Привремено вклучена поради Штедачот на батерија"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Поддржаните апликации исто така ќе се префрлат на темна тема"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Сфатив"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Поставки"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Поврзувајте се на јавни мрежи"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"мрежна врска, интернет, безжичен, мобилен, Wi-Fi, мобилна, мобилен оператор, 4G, 3G, 2G, LTE"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Прикажи мрежи безбедни за во авион"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Исклучете го авионскиот режим"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Прикажи ги мрежите во авионски режим"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Исклучи го авионскиот режим"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Поврзано"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Не може автоматски да се поврзе на интернет"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Нема други достапни мрежи"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Нема достапни мрежи"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Недостапно бидејќи е вклучен „Режимот за спиење“"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Ресетирањето на важноста на известувањата е завршено."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Апликации"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Недоверлив уред сака да пристапи до вашите пораки. Допрете за детали."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Да се дозволи пристап до пораките?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Недоверлив уред со Bluetooth, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], сака да пристапи до вашите пораки.\n\nДосега не сте се поврзале со [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Недоверлив уред со Bluetooth, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, сака да пристапи до вашите пораки.\n\nДосега не сте се поврзале со <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Недоверлив уред сака да пристапи до вашите контакти и евиденцијата на повици. Допрете за детали."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Да се дозволи пристап до контактите и евиденцијата на повици?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Недоверлив уред со Bluetooth, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], сака да пристапи до вашите контакти и евиденцијата на повици. Ова ги опфаќа податоците за дојдовните и појдовните повици.\n\nДосега не сте се поврзале со [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Недоверлив уред со Bluetooth, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, сака да пристапи до вашите контакти и евиденцијата на повици. Ова ги опфаќа податоците за дојдовните и појдовните повици.\n\nДосега не сте се поврзале со <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Осветленост"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Заклучен екран"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Видливост"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Боја"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Други"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 78d8f7a..e0960b5 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"അവസാനിക്കുന്ന സമയം"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"നില"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"തീക്ഷ്ണത"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"ഓഫ്/ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"ഒരിക്കലും സ്വയമേവ ഓണാകില്ല"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"<xliff:g id="ID_1">%1$s</xliff:g>-ന് സ്വയമേവ ഓണാക്കും"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"സൂര്യാസ്തമയ സമയത്ത് സ്വയമേവ ഓണാക്കും"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"ഓൺ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"ഒരിക്കലും സ്വമേധയാ ഓഫാകില്ല"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"<xliff:g id="ID_1">%1$s</xliff:g>-ന് സ്വമേധയാ ഓഫാകും"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"സൂര്യോദയ സമയത്ത് സ്വമേധയാ ഓഫാകും"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"അസ്തമയം മുതൽ ഉദയം വരെ ഓണാക്കുന്നു"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"ഇഷ്ടാനുസൃത സമയത്ത് ഓണാക്കുന്നു"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"നില"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"ഓഫാണ് / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"ഒരിക്കലും സ്വയമേവ ഓണാകില്ല"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"സൂര്യാസ്തമയ സമയത്ത് സ്വയമേവ ഓണാക്കും"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"<xliff:g id="ID_1">%1$s</xliff:g>-ന് സ്വയമേവ ഓണാകും"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"ഓണാണ് / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"ഒരിക്കലും സ്വയമേവ ഓഫാകില്ല"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"സൂര്യോദയ സമയത്ത് സ്വമേധയാ ഓഫാകും"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"<xliff:g id="ID_1">%1$s</xliff:g>-ന് സ്വയമേവ ഓഫാകും"</string>
@@ -1611,11 +1607,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"ആപ്പുകൾ റീസെറ്റ് ചെയ്യാനാകും"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"വൈഫൈ, മൊബൈൽ, Bluetooth റീസെറ്റ് ചെയ്യുക"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"ഇനിപ്പറയുന്നവ ഉൾപ്പെടെ എല്ലാ നെറ്റ്‍വർക്ക് ക്രമീകരണങ്ങളും ഇത് റീസെറ്റ് ചെയ്യും:\n\n"<li>"വൈഫൈ"</li>\n<li>"മൊബൈൽ ഡാറ്റ"</li>\n<li>"Bluetooth"</li></string>
-    <!-- no translation found for erase_euicc_data_button (728078969563311737) -->
-    <skip />
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"മായ്ക്കുക"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"ഡൗൺലോഡ് ചെയ്‌ത SIM-കൾ മായ്ക്കൂ"</string>
-    <!-- no translation found for reset_esim_desc (3662444090563399131) -->
-    <skip />
+    <string name="reset_esim_desc" msgid="3662444090563399131">"ഇത്, ഒരു മൊബെെൽ സേവന പ്ലാനുകളും റദ്ദാക്കില്ല. പകരം ഉപയോഗിക്കാനുള്ള സിമ്മുകൾ ഡൗൺലോഡ് ചെയ്യാൻ നിങ്ങളുടെ സേവനദാതാവിനെ ബന്ധപ്പെടുക."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"ക്രമീകരണം റീസെറ്റ് ചെയ്യുക"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"എല്ലാ നെറ്റ്‌വർക്കിംഗ് ക്രമീകരണവും പുനഃസജ്ജീകരിക്കണോ? നിങ്ങൾക്ക് ഈ പ്രവർത്തനം പഴയപടിയാക്കാനാവില്ല."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"എല്ലാ നെറ്റ്‌വർക്കിംഗ് ക്രമീകരണവും റീസെറ്റ് ചെയ്യുകയും ഡൗൺലോഡ് ചെയ്‌ത സിമ്മുകൾ മായ്ക്കുകയും ചെയ്യണോ? ഇത് പഴയപടിയാക്കാനാകില്ല."</string>
@@ -1688,7 +1682,7 @@
     <string name="usb_tethering_button_text" msgid="7364633823180913777">"USB ടെതറിംഗ്"</string>
     <string name="usb_tethering_subtext" product="default" msgid="3168636595109044213">"USB വഴി, ഫോണിന്‍റെ ഇന്‍റർനെറ്റ് കണക്ഷൻ പങ്കിടുക"</string>
     <string name="usb_tethering_subtext" product="tablet" msgid="1749659335004856576">"USB വഴി, ടാബ്‌ലെറ്റിന്‍റെ ഇന്‍റർനെറ്റ് കണക്ഷൻ പങ്കിടുക"</string>
-    <string name="bluetooth_tether_checkbox_text" msgid="6108398414967813545">"ബ്ലൂടൂത്ത് ടെതറിംഗ്"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="6108398414967813545">"Bluetooth ടെതറിംഗ്"</string>
     <string name="bluetooth_tethering_subtext" product="tablet" msgid="2023654677593885805">"Bluetooth വഴി, ടാബ്‌ലെറ്റിന്‍റെ ഇന്‍റർനെറ്റ് കണക്ഷൻ പങ്കിടുക"</string>
     <string name="bluetooth_tethering_subtext" product="default" msgid="4322810060538179348">"Bluetooth വഴി, ഫോണിന്‍റെ ഇന്‍റർനെറ്റ് കണക്ഷൻ പങ്കിടുക"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6941934844527406581">"Bluetooth വഴി, ഈ <xliff:g id="DEVICE_NAME">%1$d</xliff:g> ഉപകരണത്തിന്‍റെ ഇന്‍റർനെറ്റ് കണ‌ക്ഷൻ പങ്കിടുന്നു"</string>
@@ -2138,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"സ്‌ക്രീൻ റീഡറുകൾ"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ഓഡിയോയും സ്‌ക്രീനിലെ ടെക്‌സ്‌റ്റും"</string>
     <string name="display_category_title" msgid="6638191682294461408">"ഡി‌സ്‌പ്ലേ"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"ഇടപെടൽ നിയന്ത്രണങ്ങൾ"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"ഡൗൺലോഡ് ചെയ്‌ത ആപ്പുകൾ"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"പരീക്ഷണാത്മകം!"</string>
@@ -2458,8 +2454,7 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"ടാബ്‌ലെറ്റ്, സാധാരണയിൽ കൂടുതൽ ഉപയോഗിച്ചു"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"ഉപകരണം, സാധാരണയിൽ കൂടുതൽ ഉപയോഗിച്ചു"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"സാധാരണയിലും നേരത്തെ ബാറ്ററി ചാർജ് തീർന്നേക്കാം"</string>
-    <!-- no translation found for battery_tip_limited_temporarily_title (7152799456221596915) -->
-    <skip />
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"ബാറ്ററിയുടെ ആയുസിനായി ഒപ്റ്റിമൈസ് ചെയ്യുന്നു"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"ബാറ്ററി താൽക്കാലം പരിമിതപ്പെടുത്തി. കൂടുതലറിയാൻ ടാപ്പ് ചെയ്യുക."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"നിങ്ങളുടെ ഫോൺ സാധാരണയിൽ കൂടുതൽ ബാറ്ററി ഉപയോഗിച്ചു. നിങ്ങളുടെ ബാറ്ററിയുടെ ചാർജ് പ്രതീക്ഷിച്ചതിനേക്കാൾ വേഗത്തിൽ തീർന്നേക്കാം\n\nബാറ്ററി ഉപയോഗമനുസരിച്ചുള്ള മുൻനിര ആപ്പുകൾ ഇനിപ്പറയുന്നു:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"നിങ്ങളുടെ ടാബ്‌ലെറ്റ് സാധാരണയിൽ കൂടുതൽ ബാറ്ററി ഉപയോഗിച്ചു. നിങ്ങളുടെ ബാറ്ററിയുടെ ചാർജ് പ്രതീക്ഷിച്ചതിനേക്കാൾ വേഗത്തിൽ തീർന്നേക്കാം\n\nബാറ്ററി ഉപയോഗമനുസരിച്ചുള്ള മുൻനിര ആപ്പുകൾ ഇനിപ്പറയുന്നു:"</string>
@@ -3078,10 +3073,15 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"ഉപയോക്താവിനെ ഇല്ലാതാക്കുക"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"ഇല്ലാതാക്കുക"</string>
     <string name="user_guest" msgid="4545590092001460388">"അതിഥി"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"അതിഥിയെ നീക്കംചെയ്യുക"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"അതിഥിയെ നീക്കംചെയ്യണോ?"</string>
+    <!-- no translation found for user_clear_guest_menu (4864362688187480452) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_menu (5064400453222497734) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_confirm_title (7526978959527761497) -->
+    <skip />
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"ഈ സെഷനിലെ എല്ലാ ആപ്പുകളും ഡാറ്റയും ഇല്ലാതാക്കും."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"നീക്കംചെയ്യുക"</string>
+    <!-- no translation found for user_exit_guest_dialog_remove (8095094235815676847) -->
+    <skip />
     <string name="user_enable_calling" msgid="264875360626905535">"ഫോൺ കോളുകൾ ഓണാക്കുക"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"ഫോൺ കോളുകൾ, SMS എന്നിവ ഓണാക്കുക"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"ഉപയോക്താവിനെ ഇല്ലാതാക്കുക"</string>
@@ -3594,7 +3594,8 @@
     <string name="other_conversations" msgid="551178916855139870">"മുൻഗണനയില്ലാത്ത സംഭാഷണങ്ങൾ"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"നിങ്ങൾ മാറ്റങ്ങൾ വരുത്തിയ സംഭാഷണങ്ങൾ"</string>
     <string name="recent_conversations" msgid="471678228756995274">"അടുത്തിടെയുള്ള സംഭാഷണങ്ങൾ"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"പുതിയവ മായ്ക്കുക"</string>
+    <!-- no translation found for conversation_settings_clear_recents (4246342656145488662) -->
+    <skip />
     <string name="clear" msgid="5092178335409471100">"മായ്ക്കുക"</string>
     <string name="important_bubble" msgid="7911698275408390846">"മുൻഗണനയുള്ള സംഭാഷണങ്ങൾ ബബിൾ ആക്കുക"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"മുൻഗണനയുള്ള സംഭാഷണങ്ങൾ പുൾ-ഡൗൺ ഷെയ്‌ഡിന്റെ മുകളിൽ കാണിക്കുന്നു. നിങ്ങൾക്ക് അവയെ ബബ്ൾ ആയി സജ്ജീകരിക്കാനും \'ശല്യപ്പെടുത്തരുത്\' ഓപ്ഷൻ തടസ്സപ്പെടുത്താനുമാവും."</string>
@@ -4427,7 +4428,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"ഒന്നിലധികം ഉപകരണങ്ങളിൽ കണക്‌റ്റുചെയ്‌തു"</string>
     <string name="demo_mode" msgid="6566167465451386728">"സിസ്റ്റം UI ഡെമോ മോഡ്"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"ഡാർക്ക് തീം"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"ഓണാണ് / ബാറ്ററി ലാഭിക്കൽ കാരണം തൽക്കാലം പ്രവർത്തനരഹിതമാണ്"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"ബാറ്ററി ലാഭിക്കൽ കാരണം താൽക്കാലികമായി ഓണാക്കി"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"പിന്തുണയ്ക്കുന്ന ആപ്പുകളും ഇരുണ്ട തീമിലേക്ക് മാറും"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"മനസ്സിലായി"</string>
@@ -5066,21 +5068,34 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"മുൻഗണനകൾ"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"പൊതു നെറ്റ്‌വർക്കിലേക്ക് കണക്റ്റ് ചെയ്യുക"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"നെറ്റ്‌വർക്ക് കണക്ഷൻ, ഇന്‍റര്‍നെറ്റ്, വയർലെസ്, ഡാറ്റ, വൈഫൈ, വൈഫൈ, വൈഫൈ, സെല്ലുലാർ, മൊബൈൽ, സെൽ കാരിയർ, 4g, 3g, 2g, LTE"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"വിമാന-സുരക്ഷിത നെറ്റ്‌വർക്കുകൾ കാണുക"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"ഫ്ലൈറ്റ് മോഡ് ഓഫാക്കുക"</string>
+    <!-- no translation found for view_airplane_safe_networks (9170023210981508906) -->
+    <skip />
+    <!-- no translation found for turn_off_airplane_mode (7141986366534514443) -->
+    <skip />
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"കണക്റ്റ് ചെയ്തു"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"ഇന്റർനെറ്റ് സ്വയമേവ കണക്റ്റാകില്ല"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"മറ്റ് നെറ്റ്‌വർക്കുകളൊന്നും ലഭ്യമല്ല"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"നെറ്റ്‌വർക്കുകളൊന്നും ലഭ്യമല്ല"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"ഉറക്ക സമയ മോഡ് ഓണായതിനാൽ ലഭ്യമല്ല"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"അറിയിപ്പുകളുടെ പ്രാധാന്യം റീസെറ്റ് ചെയ്യുന്നത് പൂർത്തിയാക്കി."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"ആപ്പുകൾ"</string>
-    <!-- no translation found for bluetooth_message_access_notification_content (2986108412562309009) -->
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"വിശ്വസനീയമല്ലാത്ത ഒരു ഉപകരണം, നിങ്ങളുടെ സന്ദേശങ്ങൾ ആക്‌സസ് ചെയ്യാൻ താൽപ്പര്യപ്പെടുന്നു. വിശദാംശങ്ങൾക്ക് ടാപ്പ് ചെയ്യുക."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"സന്ദേശങ്ങളിലേക്ക് ആക്‌സസ് അനുവദിക്കണോ?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"വിശ്വസനീയമല്ലാത്ത ഒരു Bluetooth ഉപകരണം, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, നിങ്ങളുടെ സന്ദേശങ്ങൾ ആക്‌സസ് ചെയ്യാൻ താൽപ്പര്യപ്പെടുന്നു.\n\nനിങ്ങൾ <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> എന്നതിലേക്ക് മുമ്പ് കണക്റ്റ് ചെയ്‌തിട്ടില്ല."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"വിശ്വസനീയമല്ലാത്ത ഒരു ഉപകരണം, നിങ്ങളുടെ കോൺടാക്‌റ്റുകളും കോൾ ചരിത്രവും ആക്‌സസ് ചെയ്യാൻ താൽപ്പര്യപ്പെടുന്നു. വിശദാംശങ്ങൾക്ക് ടാപ്പ് ചെയ്യുക."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"കോൺടാക്‌റ്റുകളിലേക്കും കോൾ ചരിത്രത്തിലേക്കും ആക്‌സസ് അനുവദിക്കണോ?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"വിശ്വസനീയമല്ലാത്ത ഒരു Bluetooth ഉപകരണം, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, നിങ്ങളുടെ കോൺടാക്‌റ്റുകളും കോൾ ചരിത്രവും ആക്‌സസ് ചെയ്യാൻ താൽപ്പര്യപ്പെടുന്നു. ഇൻകമിംഗ്, ഔട്ട്‌ഗോയിംഗ് കോളുകളെക്കുറിച്ചുള്ള ഡാറ്റ ഇതിൽ ഉൾപ്പെടുന്നു.\n\n നിങ്ങൾ <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> എന്നതിലേക്ക് മുമ്പ് കണക്‌റ്റ് ചെയ്‌തിട്ടില്ല."</string>
+    <!-- no translation found for category_name_brightness (8520372392029305084) -->
     <skip />
-    <!-- no translation found for bluetooth_message_access_dialog_title (9009836130395061579) -->
+    <!-- no translation found for category_name_lock_display (7478785189102882266) -->
     <skip />
-    <!-- no translation found for bluetooth_message_access_dialog_content (6004506637437582983) -->
+    <!-- no translation found for category_name_visibility (4485030512199246405) -->
     <skip />
-    <!-- no translation found for bluetooth_phonebook_access_notification_content (4280361621526852063) -->
+    <!-- no translation found for category_name_color (937514550918977151) -->
     <skip />
-    <!-- no translation found for bluetooth_phonebook_access_dialog_title (7624607995928968721) -->
+    <!-- no translation found for category_name_others (2366006298768550310) -->
     <skip />
-    <!-- no translation found for bluetooth_phonebook_access_dialog_content (2235876209172857819) -->
+    <!-- no translation found for category_name_general (7737273712848115886) -->
     <skip />
 </resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index ffae982..790d609 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Дуусах цаг"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Төлөв"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Нэвчилт"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Унтраасан / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Огт автоматаар асахгүй"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"<xliff:g id="ID_1">%1$s</xliff:g>-д автоматаар асна"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Нар жаргахад автоматаар асна"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Асаалттай / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Огт автоматаар унтрахгүй"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"<xliff:g id="ID_1">%1$s</xliff:g>-д автоматаар унтарна"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Нар мандахад автоматаар унтарна"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Нар жаргахаас мандах хүртэл асна"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Тохируулсан хугацаанд асна"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Төлөв"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Унтраалттай / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Автоматаар хэзээ ч асахгүй"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Нар жаргахад автоматаар асна"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"<xliff:g id="ID_1">%1$s</xliff:g>-д автоматаар асна"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Асаалттай / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Автоматаар хэзээ ч унтрахгүй"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Нар мандахад автоматаар унтарна"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"<xliff:g id="ID_1">%1$s</xliff:g>-д автоматаар унтарна"</string>
@@ -1613,7 +1609,7 @@
     <string name="reset_network_desc" msgid="1112523764899788246">"Энэ нь дараах бүх сүлжээний тохиргоог шинэчилнэ: \n\n"<li>"Wi‑Fi"</li>\n<li>"мобайл дата"</li>\n<li>"Bluetooth"</li></string>
     <string name="erase_euicc_data_button" msgid="728078969563311737">"Устгах"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Татаж авсан СИМ-үүдийг устгах"</string>
-    <string name="reset_esim_desc" msgid="3662444090563399131">"Энэ нь мобайл үйлчилгээний аливаа төлөвлөгөөг цуцлахгүй. Орлуулах SIM татахын тулд оператор компанитайгаа холбогдоно уу."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Энэ нь мобайл үйлчилгээний ямар ч багцыг цуцлахгүй. Орлуулах SIM татахын тулд оператор компанитайгаа холбогдоно уу."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Дахин тохируулах"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Сүлжээний бүх тохиргоог шинэчлэх үү? Та энэ үйлдлийг буцаах боломжгүй."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Сүлжээний бүх тохиргоог шинэчилж, татсан СИМ-үүдийг устгах уу? Та энэ үйлдлийг буцаах боломжгүй."</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Дэлгэц уншигч"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Аудио &amp; дэлгэцийн текст"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Дэлгэц"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Харилцан үйлдлийн хяналт"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Татсан аппууд"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Туршилтын"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Хэрэглэгчийг устгах"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Устгах"</string>
     <string name="user_guest" msgid="4545590092001460388">"Зочин"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Зочныг хасах"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Зочныг хасах уу?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Зочны өгөгдлийг арилгах"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Зочны сургалтыг дуусгах"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Зочны сургалтыг дуусгах уу?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Энэ сешний бүх апп болон дата устах болно."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Хасах"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Сургалтыг дуусгах"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Утасны дуудлага авах"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Утасны дуудлага &amp; SMS авах"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Хэрэглэгчийг устгах"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Чухал биш харилцан яриа"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Таны өөрчлөлт хийсэн харилцан яриа"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Саяхны харилцан яриа"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Саяхныхыг арилгах"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Саяхны бүгдийг арилгах"</string>
     <string name="clear" msgid="5092178335409471100">"Арилгах"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Чухал харилцан яриаг бөмбөлөг болгох"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Чухал харилцан яриаг доош татдаг хураангуй самбарын дээд хэсэгт харуулдаг. Та мөн тэдгээрийг бөмбөлөг болгон тохируулж, Бүү саад бол горимыг тасалдуулж болно."</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Олон төхөөрөмжтэй холбогдсон"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Системийн UI демо горим"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Бараан загвар"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Асаалттай / Батарей хэмнэгчийн улмаас түр хугацаанд идэвхгүй болгосон"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Батарей хэмнэгчийн улмаас түр хугацаанд асаасан"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Дэмжигдсэн аппууд мөн бараан загвар луу сэлгэнэ"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Ойлголоо"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Сонголт"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Олон нийтийн Wi-Fi сүлжээнд холбогдох"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"сүлжээний холболт, интернэт, утасгүй интернэт, дата, wifi, wi-fi, wi fi, үүрэн холбоо, мобайл, үүрэн холбооны оператор, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Нислэгийн аюулгүй сүлжээг харах"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Нислэгийн горимыг унтраах"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Нислэгийн горимын сүлжээг харах"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Нислэгийн горимыг унтраах"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Холбогдсон"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Интернэт автоматаар холбогдохгүй"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Өөр боломжтой сүлжээ байхгүй байна"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Боломжтой сүлжээ байхгүй байна"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Унтлагын цагийн горим асаалттай байгаа тул боломжгүй"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Мэдэгдлийн ач холбогдлыг шинэчилж дууссан."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Аппууд"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Итгэмжлэгдээгүй төхөөрөмж таны мессежид хандахыг хүсэж байна. Дэлгэрэнгүйг харахын тулд товшино уу."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Мессежид хандахыг зөвшөөрөх үү?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Итгэмжлэгдээгүй Bluetooth төхөөрөмж болох [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] таны мессежид хандахыг хүсэж байна.\n\nТа өмнө нь [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]-д холбогдож байгаагүй."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Итгэмжлэгдээгүй Bluetooth төхөөрөмж болох <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> таны мессежид хандахыг хүсэж байна.\n\nТа өмнө нь <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>-д холбогдож байгаагүй."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Итгэмжлэгдээгүй төхөөрөмж таны харилцагчид болон дуудлагын жагсаалтад хандахыг хүсэж байна. Дэлгэрэнгүйг харахын тулд товшино уу."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Харилцагчид болон дуудлагын жагсаалтад хандахыг зөвшөөрөх үү?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Итгэмжлэгдээгүй Bluetooth төхөөрөмж болох [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] таны харилцагчид болон дуудлагын жагсаалтад хандахыг хүсэж байна. Үүнд ирж буй болон залгасан дуудлагын талаарх өгөгдөл багтана.\n\nТа өмнө нь [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]-д холбогдож байгаагүй."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Итгэмжлэгдээгүй Bluetooth төхөөрөмж болох <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> таны харилцагчид болон дуудлагын жагсаалтад хандахыг хүсэж байна. Үүнд ирж буй болон залгасан дуудлагын талаарх өгөгдөл багтана.\n\nТа өмнө нь <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>-д холбогдож байгаагүй."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Гэрэлтүүлэг"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Дэлгэцийг түгжих"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Харагдац"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Өнгө"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Бусад"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index fdd5bac..5eced26 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"संपण्याची वेळ"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"स्थिती"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"तीव्रता"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"बंद / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"आपोआप कधीही सुरू होणार नाही"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"<xliff:g id="ID_1">%1$s</xliff:g> वाजता आपोआप सुरू होईल"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"सूर्यास्ताच्या वेळी आपोआप सुरू होईल"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"सुरू / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"आपोआप कधीही बंद होणार नाही"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"<xliff:g id="ID_1">%1$s</xliff:g> वाजता आपोआप बंद होईल"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"सूर्योदयाच्या वेळी आपोआप बंद होईल"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"सूर्यास्त-सूर्योदय सुरू राहते"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"कस्टम वेळी सुरू होते"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"स्थिती"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"बंद आहे / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"आपोआप कधीही सुरू होणार नाही"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"सूर्यास्ताच्या वेळी आपोआप सुरू होईल"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"<xliff:g id="ID_1">%1$s</xliff:g> वाजता आपोआप सुरू होईल"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"सुरू आहे / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"आपोआप कधीही बंद होणार नाही"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"सूर्योदयाच्या वेळी आपोआप बंद होईल"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"<xliff:g id="ID_1">%1$s</xliff:g> वाजता आपोआप बंद होईल"</string>
@@ -1612,11 +1608,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"ॲप्स रीसेट केली जाऊ शकतात"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"वाय-फाय, मोबाइल आणि ब्लूटूथ रीसेट करा"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"हे यांसह सर्व नेटवर्क सेटिंग्‍ज रीसेट करेल:\n\n"<li>"वाय‑फाय"</li>\n<li>"मोबाइल डेटा"</li>\n<li>"ब्लूटुथ"</li></string>
-    <!-- no translation found for erase_euicc_data_button (728078969563311737) -->
-    <skip />
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"मिटवा"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"डाउनलोड केलेली सिम मिटवा"</string>
-    <!-- no translation found for reset_esim_desc (3662444090563399131) -->
-    <skip />
+    <string name="reset_esim_desc" msgid="3662444090563399131">"यामुळे कोणतेही मोबाइल सेवा प्लॅन रद्द होणार नाहीत. बदललेले SIM डाउनलोड करण्यासाठी तुमच्या वाहकाशी संपर्क साधा."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"सेटिंग्ज रीसेट करा"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"सर्व नेटवर्क सेटिंग्ज रीसेट करायची? तुम्ही ही कृती पहिल्यासारखी करू शकत नाही."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"सर्व नेटवर्क सेटिंग्ज रीसेट करायची आणि डाउनलोड केलेली सिम मिटवायची? तुम्ही ही कृती पहिल्यासारखी करू शकत नाही."</string>
@@ -2139,6 +2133,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"स्क्रीन वाचक"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ऑडिओ आणि स्क्रीनवरील मजकूर"</string>
     <string name="display_category_title" msgid="6638191682294461408">"डिस्प्ले"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"संवादात्मकता नियंत्रणे"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"डाउनलोड केलेली अ‍ॅप्स"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"प्रायोगिक"</string>
@@ -2459,8 +2455,7 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"टॅबलेट नेहमीपेक्षा जास्त वापरले गेला"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"डिव्हाइस नेहमीपेक्षा जास्त वापरले गेले"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"बॅटरी नेहमीपेक्षा लवकर संपू शकते"</string>
-    <!-- no translation found for battery_tip_limited_temporarily_title (7152799456221596915) -->
-    <skip />
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"बॅटरीची क्षमता वाढवण्यासाठी ऑप्टिमाइझ करत आहे"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"बॅटरी तात्पुरती मर्यादित आहे. अधिक जाणून घेण्यासाठी टॅप करा."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"तुमचा फोन नेहमीपेक्षा जास्त वापरला गेला आहे. तुमची बॅटरी अपेक्षेपेक्षा लवकर संपू शकते.\n\nबॅटरीच्या वापरावर आधारित टॉप अ‍ॅप्स:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"तुमचा टॅबलेट नेहमीपेक्षा जास्त वापरला गेला आहे. तुमची बॅटरी अपेक्षेपेक्षा लवकर संपू शकते.\n\nबॅटरीच्या वापरावर आधारित टॉप अ‍ॅप्स:"</string>
@@ -3079,10 +3074,15 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"वापरकर्ता हटवा"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"हटवा"</string>
     <string name="user_guest" msgid="4545590092001460388">"अतिथी"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"अतिथी काढा"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"अतिथी काढायचे?"</string>
+    <!-- no translation found for user_clear_guest_menu (4864362688187480452) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_menu (5064400453222497734) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_confirm_title (7526978959527761497) -->
+    <skip />
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"या सत्रातील सर्व अ‍ॅप्स आणि डेटा हटवला जाईल."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"काढा"</string>
+    <!-- no translation found for user_exit_guest_dialog_remove (8095094235815676847) -->
+    <skip />
     <string name="user_enable_calling" msgid="264875360626905535">"फोन कॉल सुरू करा"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"फोन कॉल आणि SMS सुरू करा"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"वापरकर्ता हटवा"</string>
@@ -3595,7 +3595,8 @@
     <string name="other_conversations" msgid="551178916855139870">"प्राधान्य नसलेली संभाषणे"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"तुम्ही बदल केलेली संभाषणे"</string>
     <string name="recent_conversations" msgid="471678228756995274">"अलीकडील संभाषणे"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"अलीकडचे साफ करा"</string>
+    <!-- no translation found for conversation_settings_clear_recents (4246342656145488662) -->
+    <skip />
     <string name="clear" msgid="5092178335409471100">"साफ करा"</string>
     <string name="important_bubble" msgid="7911698275408390846">"प्राधान्य असलेल्या संभाषणांना बबल करा"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"प्राधान्य असलेली संभाषणे पुल-डाउन शेडच्या सर्वात वरती दिसतात. तुम्ही त्यांना बबलवरदेखील सेट करू शकता आणि व्यत्यय आणू नका मध्ये व्यत्यय आणू शकता."</string>
@@ -4428,7 +4429,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"एकाधिक डिव्हाइसशी कनेक्ट केले"</string>
     <string name="demo_mode" msgid="6566167465451386728">"सिस्टम UI डेमो मोड"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"गडद थीम"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"सुरू आहे / बॅटरी सेव्हरमुळे तात्पुरते बंद केले आहे"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"बॅटरी सेव्हरमुळे तात्पुरते सुरू केले आहे"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"सपोर्ट असलेली अ‍ॅप्सदेखील गडद थीमवर स्विच करतील"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"समजले"</string>
@@ -5067,21 +5069,39 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"प्राधान्ये"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"सार्वजनिक नेटवर्कशी कनेक्ट करा"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"नेटवर्क कनेक्शन, इंटरनेट, वायरलेस, डेटा, वायफाय, वाय-फाय, वाय फाय, सेल्युलर, मोबाइल, सेल वाहक, 4g, 3g, 2g, LTE"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"विमानात वापरण्यास सुरक्षित नेटवर्क पहा"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"विमान मोड बंद करा"</string>
+    <!-- no translation found for view_airplane_safe_networks (9170023210981508906) -->
+    <skip />
+    <!-- no translation found for turn_off_airplane_mode (7141986366534514443) -->
+    <skip />
+    <!-- no translation found for preference_summary_default_combination (4643585915107796253) -->
+    <skip />
+    <!-- no translation found for mobile_data_connection_active (2422223108911581552) -->
+    <skip />
+    <!-- no translation found for mobile_data_off_summary (3841411571485837651) -->
+    <skip />
+    <!-- no translation found for non_carrier_network_unavailable (9031567407964127997) -->
+    <skip />
+    <!-- no translation found for all_network_unavailable (1163897808282057496) -->
+    <skip />
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"बेडटाइम मोड सुरू असल्यामुळे उपलब्ध नाही"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"सूचनांचे महत्त्व रीसेट करणे पूर्ण झाले."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"ॲप्स"</string>
-    <!-- no translation found for bluetooth_message_access_notification_content (2986108412562309009) -->
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"अविश्वासू डिव्हाइसला तुमचे मेसेज अ‍ॅक्सेस करायचे आहेत. तपशीलांसाठी टॅप करा."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"मेसेज अ‍ॅक्सेस करण्याची अनुमती द्यायची का?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"एका विश्वसनीय नसलेल्या ब्लूटूथ डिव्‍हाइसला, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, तुमचे मेसेज अ‍ॅक्सेस करायचे आहेत.\n\nतुम्ही यापूर्वी <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> शी कनेक्ट केलेले नाही."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"अविश्वासू डिव्हाइसला तुमचे संपर्क आणि कॉल लॉग अ‍ॅक्सेस करायचे आहेत. तपशीलांसाठी टॅप करा."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"संपर्क आणि कॉल लॉग अ‍ॅक्सेस करण्याची अनुमती द्यायची का?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"एका विश्वसनीय नसलेल्या ब्लूटूथ डिव्‍हाइसला, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, तुमचे संपर्क आणि कॉल लॉग अ‍ॅक्सेस करायचे आहेत. यामध्ये इनकमिंग आणि आउटगोइंग कॉलच्या डेटाचा समावेश आहे.\n\nतुम्ही यापूर्वी <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> शी कनेक्ट केलेले नाही."</string>
+    <!-- no translation found for category_name_brightness (8520372392029305084) -->
     <skip />
-    <!-- no translation found for bluetooth_message_access_dialog_title (9009836130395061579) -->
+    <!-- no translation found for category_name_lock_display (7478785189102882266) -->
     <skip />
-    <!-- no translation found for bluetooth_message_access_dialog_content (6004506637437582983) -->
+    <!-- no translation found for category_name_visibility (4485030512199246405) -->
     <skip />
-    <!-- no translation found for bluetooth_phonebook_access_notification_content (4280361621526852063) -->
+    <!-- no translation found for category_name_color (937514550918977151) -->
     <skip />
-    <!-- no translation found for bluetooth_phonebook_access_dialog_title (7624607995928968721) -->
+    <!-- no translation found for category_name_others (2366006298768550310) -->
     <skip />
-    <!-- no translation found for bluetooth_phonebook_access_dialog_content (2235876209172857819) -->
+    <!-- no translation found for category_name_general (7737273712848115886) -->
     <skip />
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index f3170e5..2e988a2 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Masa tamat"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Status"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Keamatan"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Mati / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Tidak akan dihidupkan secara automatik"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Akan dihidupkan secara automatik pada <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Akan dihidupkan secara automatik pada waktu matahari terbenam"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Hidup / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Tidak akan dimatikan secara automatik"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Akan dimatikan secara automatik pada <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Akan dimatikan secara automatik pada waktu matahari terbit"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Hidup dari senja hingga syuruk"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Dihidupkan pada waktu tersuai"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Status"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Mati / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Tidak akan dihidupkan secara automatik"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Akan dihidupkan secara automatik pada waktu matahari terbenam"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Akan hidup secara automatik pada <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Hidup / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Tidak akan dimatikan secara automatik"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Akan dimatikan secara automatik pada waktu matahari terbit"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Akan mati secara automatik pada <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Pembaca skrin"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio &amp; teks pada skrin"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Paparan"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Kawalan interaksi"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Apl yang dimuat turun"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Percubaan"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Padam pengguna"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Padam"</string>
     <string name="user_guest" msgid="4545590092001460388">"Tetamu"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Alih keluar tetamu"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Alih keluar tetamu?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Kosongkan data tetamu"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Tamatkan sesi tetamu"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Tamatkan sesi tetamu?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Semua apl dan data dalam sesi ini akan dipadam."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Alih keluar"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Tamatkan sesi"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Hidupkan panggilan telefon"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Hidupkan panggilan telefon &amp; SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Padamkan pengguna"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Perbualan tanpa keutamaan"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Perbualan yang telah anda buat perubahan"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Perbualan terbaharu"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Kosongkan baru-baru ini"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Kosongkan semua yang terbaharu"</string>
     <string name="clear" msgid="5092178335409471100">"Kosongkan"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Gelembungkan perbualan keutamaan"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Perbualan keutamaan ditunjukkan di bahagian atas bidai tarik turun. Anda juga boleh menetapkan perbualan ini agar dipaparkan dalam gelembung dan boleh mengganggu ciri Jangan Ganggu."</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Dihubungkan ke berbilang peranti"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Mod tunjuk cara UI sistem"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Tema gelap"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Hidup / Dilumpuhkan sementara disebabkan Penjimat Bateri"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Dihidupkan untuk sementara disebabkan Penjimat Bateri"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Apl yang disokong juga akan ditukar kepada tema gelap"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"OK"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Pilihan"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Sambungkan kepada rangkaian awam"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"sambungan rangkaian, internet, wayarles, data, wifi, wi-fi, wi fi, selular, mudah alih, pembawa selular, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Paparkan rangkaian selamat pesawat"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Matikan Mod Pesawat"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Lihat rangkaian mod pesawat"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Matikan mod pesawat"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Disambungkan"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet tidak akan bersambung secara automatik"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Tiada rangkaian lain yang tersedia"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Tiada rangkaian tersedia"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Tidak tersedia kerana mod waktu tidur dihidupkan"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Selesai menetapkan semula kepentingan pemberitahuan."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Apl"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Peranti yang tidak dipercayai ingin mengakses mesej anda. Ketik untuk mendapatkan butiran."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Benarkan akses kepada mesej?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Peranti Bluetooth yang tidak dipercayai, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ingin mengakses mesej anda.\n\nAnda belum pernah disambungkan kepada [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Peranti Bluetooth yang tidak dipercayai, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, ingin mengakses mesej anda.\n\nAnda belum pernah disambungkan kepada <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Peranti yang tidak dipercayai ingin mengakses kenalan dan log panggilan anda. Ketik untuk mendapatkan butiran."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Benarkan akses kepada kenalan dan log panggilan?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Peranti Bluetooth yang tidak dipercayai, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ingn mengakses kenalan dan log panggilan anda. Ini termasuk data tentang panggilan masuk dan keluar.\n\nAnda belum pernah disambungkan kepada [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Peranti Bluetooth yang tidak dipercayai, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, ingn mengakses kenalan dan log panggilan anda. Ini termasuk data tentang panggilan masuk dan keluar.\n\nAnda belum pernah disambungkan kepada <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Kecerahan"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Paparan Kunci"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Keterlihatan"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Warna"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Lain-lain"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index d5fec3a..2be48e4 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"ပြီးဆုံးချိန်"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"အခြေအနေ"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"တောက်ပမှု"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"ပိတ်ထားသည် / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"ဘယ်တော့မှ အလိုအလျောက် ပွင့်မည် မဟုတ်ပါ"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"<xliff:g id="ID_1">%1$s</xliff:g> တွင် အလိုအလျောက် ပွင့်ပါမည်"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"နေဝင်ချိန်တွင် အလိုအလျောက် ပွင့်ပါမည်"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"ဖွင့်ထားသည် / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"မည်သည့်အခါမျှ အလိုအလျောက် ပိတ်မည် မဟုတ်ပါ"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"<xliff:g id="ID_1">%1$s</xliff:g> တွင် အလိုအလျောက် ပိတ်ပါမည်"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"နေထွက်ချိန်တွင် အလိုအလျောက် ပိတ်ပါမည်"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"နေဝင်ချိန်မှ နေထွက်ချိန်ထိ ဖွင့်ရန်"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"သတ်မှတ်ချိန်တွင် ဖွင့်ရန်"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"အခြေအနေ"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"ပိတ်ရန် / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"ဘယ်တော့မှ အလိုအလျောက် ပွင့်မည် မဟုတ်ပါ"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"နေဝင်ချိန်တွင် အလိုအလျောက် ပွင့်ပါမည်"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"<xliff:g id="ID_1">%1$s</xliff:g> တွင် အလိုအလျောက် ပွင့်ပါမည်"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"ဖွင့်ရန် / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"မည်သည့်အခါမျှ အလိုအလျောက် ပိတ်မည် မဟုတ်ပါ"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"နေထွက်ချိန်တွင် အလိုအလျောက် ပိတ်ပါမည်"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"<xliff:g id="ID_1">%1$s</xliff:g> တွင် အလိုအလျောက် ပိတ်ပါမည်"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"မျက်နှာပြင် ဖတ်စနစ်များ"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"အသံနှင့် ဖန်သားပြင်ပေါ်ရှိ စာသား"</string>
     <string name="display_category_title" msgid="6638191682294461408">"ဖန်သားပြင် ပြသမှု"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"အပြန်အလှန်ဆက်သွယ်ချက် ထိန်းချုပ်မှုများ"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"ဒေါင်းလုဒ်လုပ်ထားသော အက်ပ်များ"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"စမ်းသပ်ဆဲ"</string>
@@ -2238,7 +2236,7 @@
     <string name="accessibility_autoclick_custom_title" msgid="4597792235546232038">"မိမိစိတ်ကြိုက်"</string>
     <string name="accessibility_autoclick_shorter_desc" msgid="7631013255724544348">"ပိုတိုသည်"</string>
     <string name="accessibility_autoclick_longer_desc" msgid="2566025502981487443">"ပိုကြာသည်"</string>
-    <string name="accessibility_autoclick_seekbar_desc" msgid="8363959277814621118">"အလိုအလျောက် ကလစ်လုပ်ရန်အချိန်"</string>
+    <string name="accessibility_autoclick_seekbar_desc" msgid="8363959277814621118">"အလိုအလျောက် နှိပ်ရန်အချိန်"</string>
     <string name="accessibility_vibration_settings_title" msgid="5198184603753129450">"တုန်ခါမှုနှင့် တုန်ခါ၍တုံ့ပြန်မှုအား"</string>
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"အကြောင်းကြားချက် တုန်ခါမှု"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"ဖုန်းမြည်သံ တုန်ခါမှု"</string>
@@ -3075,10 +3073,15 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"သုံးစွဲသူကိုဖျက်ရန်"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"ဖျက်ရန်"</string>
     <string name="user_guest" msgid="4545590092001460388">"ဧည့်သည်"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"ဧည့်သည်ကို ဖယ်ထုတ်ရန်"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"ဧည့်သည်ကို ဖယ်ထုတ်လိုက်ရမလား?"</string>
+    <!-- no translation found for user_clear_guest_menu (4864362688187480452) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_menu (5064400453222497734) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_confirm_title (7526978959527761497) -->
+    <skip />
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"ဒီချိတ်ဆက်မှု ထဲက အက်ပ်များ အားလုံး နှင့် ဒေတာကို ဖျက်ပစ်မည်။"</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"ဖယ်ထုတ်ပါ"</string>
+    <!-- no translation found for user_exit_guest_dialog_remove (8095094235815676847) -->
+    <skip />
     <string name="user_enable_calling" msgid="264875360626905535">"ဖုန်းခေါ်ဆိုမှုများ ဖွင့်မည်"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"ဖုန်းခေါ်ဆိုမှုနှင့် SMS ဖွင့်မည်"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"အသုံးပြုသူကို ဖျက်ပါ"</string>
@@ -3591,7 +3594,8 @@
     <string name="other_conversations" msgid="551178916855139870">"ဦးစားပေးမဟုတ်သည့် စကားဝိုင်းများ"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"သင်အပြောင်းအလဲ ပြုလုပ်ထားသော စကားဝိုင်းများ"</string>
     <string name="recent_conversations" msgid="471678228756995274">"မကြာသေးမီက စကားဝိုင်းများ"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"လတ်တလောအရာ ရှင်းရန်"</string>
+    <!-- no translation found for conversation_settings_clear_recents (4246342656145488662) -->
+    <skip />
     <string name="clear" msgid="5092178335409471100">"ရှင်းရန်"</string>
     <string name="important_bubble" msgid="7911698275408390846">"ဦးစားပေး စကားဝိုင်းများကို ပူဖောင်းကွက်အဖြစ် ပြသခြင်း"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"ဦးစားပေး စကားဝိုင်းများက ဆွဲချစာရင်း၏ ထိပ်တွင် ပေါ်လာသည်။ \'မနှောင့်ယှက်ရ\' တွင် ပူဖောင်းကွက်အဖြစ် ကြားဖြတ်ပြသရန်လည်း သတ်မှတ်နိုင်သည်။"</string>
@@ -4424,7 +4428,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"စက်ပစ္စည်းအများအပြားနှင့် ချိတ်ဆက်ထားပါသည်"</string>
     <string name="demo_mode" msgid="6566167465451386728">"စနစ် UI သရုပ်ပြမုဒ်"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"မှောင်သည့် အပြင်အဆင်"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"ဖွင့်/ \'ဘက်ထရီ အားထိန်း\' ကြောင့် ယာယီပိတ်ထားသည်"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"\'ဘက်ထရီအားထိန်း\' ကြောင့် ယာယီဖွင့်ထားသည်"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"ပံ့ပိုးထားသော အက်ပ်များကိုလည်း မှောင်သည့် အပြင်အဆင်သို့ ပြောင်းပါမည်"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"ရပါပြီ"</string>
@@ -5063,15 +5068,34 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ရွေးချယ်မှုများ"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"အများသုံးကွန်ရက်များသို့ ချိတ်ဆက်လိုက်သည်"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ကွန်ရက်ချိတ်ဆက်မှု၊ အင်တာနက်၊ ကြိုးမဲ့၊ ဒေတာ၊ wifi၊ wi-fi၊ wi fi၊ ဆယ်လူလာ၊ မိုဘိုင်း၊ ဖုန်းဝန်ဆောင်မှုပေးသူ၊ 4g၊ 3g၊ 2g၊ lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"လေယာဉ်ပျံလုံခြုံရေး ကွန်ရက်များ ကြည့်ရန်"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"\'လေယာဉ်ပျံမုဒ်\' ကို ပိတ်ရန်"</string>
+    <!-- no translation found for view_airplane_safe_networks (9170023210981508906) -->
+    <skip />
+    <!-- no translation found for turn_off_airplane_mode (7141986366534514443) -->
+    <skip />
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"ချိတ်ဆက်ထားသည်"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"အင်တာနက်က အလိုအလျောက် ချိတ်ဆက်မည်မဟုတ်ပါ"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"အခြားကွန်ရက်များ မရှိပါ"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"ကွန်ရက်များ မရှိပါ"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"အိပ်ချိန်မုဒ်ကို ဖွင့်ထားသောကြောင့် မရရှိနိုင်ပါ"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"အကြောင်းကြားချက်၏ အရေးပါမှုကို ပြင်ဆင်သတ်မှတ်ပြီးပါပြီ။"</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"အက်ပ်များ"</string>
-    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"မယုံကြည်ရသော စက်ပစ္စည်းက သင်၏ မက်ဆေ့ဂျ်များကို အသုံးပြုလိုသည်။ အသေးစိတ်အချက်အလက်များအတွက် တို့ပါ။"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"မယုံကြည်ရသော စက်ပစ္စည်းက သင်၏ မက်ဆေ့ဂျ်များသို့ ဝင်ခွင့်ရလိုသည်။ အသေးစိတ်အချက်အလက်များအတွက် တို့ပါ။"</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"မက်ဆေ့ဂျ်များကို အသုံးပြုခွင့်ပေးမလား။"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"မယုံကြည်ရသော ဘလူးတုသ်သုံးစက်၊ [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]၊ က သင်၏ မက်ဆေ့ဂျ်များကို အသုံးပြုလိုသည်။\n\nသင်သည် [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ကို ယခင်က မချိတ်ဆက်ဖူးပါ။"</string>
-    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"မယုံကြည်ရသော စက်ပစ္စည်းက သင်၏ အဆက်အသွယ်များနှင့် ခေါ်ဆိုမှုမှတ်တမ်းကို အသုံးပြုလိုသည်။ အသေးစိတ်အချက်အလက်များအတွက် တို့ပါ။"</string>
-    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"အဆက်အသွယ်များနှင့် ခေါ်ဆိုမှုမှတ်တမ်းကို အသုံးပြုခွင့်ပေးမလား။"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"မယုံကြည်ရသော ဘလူးတုသ်သုံးစက်၊ [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]၊ က သင်၏ အဆက်အသွယ်များနှင့် ခေါ်ဆိုမှုမှတ်တမ်းကို အသုံးပြုလိုသည်။ ၎င်းတွင် အဝင်နှင့် အထွက်ခေါ်ဆိုမှုများဆိုင်ရာ ဒေတာ ပါဝင်သည်။\n\nသင်သည် [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ကို ယခင်က မချိတ်ဆက်ဖူးပါ။"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"မယုံကြည့်ရသော ဘလူးတုသ်သုံးစက် <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> က သင်၏ မက်ဆေ့ဂျ်များသို့ ဝင်ခွင့်ရလိုသည်။\n\nသင်သည် <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> ကို ယခင်က မချိတ်ဆက်ဖူးပါ။"</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"မယုံကြည်ရသော စက်ပစ္စည်းက သင်၏ အဆက်အသွယ်များနှင့် ခေါ်ဆိုမှုမှတ်တမ်းသို့ ဝင်ရောက်လိုသည်။ အသေးစိတ်အချက်အလက်များအတွက် တို့ပါ။"</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"အဆက်အသွယ်များနှင့် ခေါ်ဆိုမှုမှတ်တမ်းသို့ ဝင်ခွင့်ပေးမလား။"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"မယုံကြည်ရသော ဘလူးတုသ်သုံးစက် <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> က သင်၏ အဆက်အသွယ်များနှင့် ခေါ်ဆိုမှုမှတ်တမ်းသို့ ဝင်ရောက်လိုသည်။ ၎င်းတွင် အဝင်နှင့် အထွက်ခေါ်ဆိုမှုများဆိုင်ရာ ဒေတာ ပါဝင်သည်။\n\nသင်သည် <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> ကို ယခင်က မချိတ်ဆက်ဖူးပါ။"</string>
+    <!-- no translation found for category_name_brightness (8520372392029305084) -->
+    <skip />
+    <!-- no translation found for category_name_lock_display (7478785189102882266) -->
+    <skip />
+    <!-- no translation found for category_name_visibility (4485030512199246405) -->
+    <skip />
+    <!-- no translation found for category_name_color (937514550918977151) -->
+    <skip />
+    <!-- no translation found for category_name_others (2366006298768550310) -->
+    <skip />
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index f8b0ab1..f947e64 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Sluttid"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Status"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intensitet"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Av / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Blir aldri slått på automatisk"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Blir slått på automatisk klokken <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Blir slått på automatisk ved solnedgang"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"På / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Blir aldri slått av automatisk"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Blir slått av automatisk klokken <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Blir slått av automatisk ved soloppgang"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"På fra solnedgang til soloppgang"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Aktiveres på angitt tidspunkt"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Status"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Av / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Blir aldri slått på automatisk"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Blir slått på automatisk ved solnedgang"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Blir slått på automatisk klokken <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"På / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Blir aldri slått av automatisk"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Blir slått av automatisk ved soloppgang"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Blir slått av automatisk klokken <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Skjermlesere"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Lyd og tekst på skjermen"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Skjerm"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Interaksjonskontroller"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Nedlastede apper"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"På forsøksstadiet"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Slett bruker"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Slett"</string>
     <string name="user_guest" msgid="4545590092001460388">"Gjest"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Fjern gjesten"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Vil du fjerne gjesten?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Fjern gjestedata"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Avslutt gjesteøkten"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Vil du avslutte gjesteøkten?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Alle appene og all informasjon i denne økten kommer til å slettes."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Fjern"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Avslutt økten"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Slå på telefonsamtaler"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Slå på telefonsamtaler og SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Slett brukeren"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Samtaler som ikke prioriteres"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Samtaler du har endret"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Nylige samtaler"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Fjern nylige"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Fjern alle nylige"</string>
     <string name="clear" msgid="5092178335409471100">"Fjern"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Lag boble for prioriterte samtaler"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Prioriterte samtaler vises øverst i nedtrekkspanelet. Du kan også få dem til å lage bobler og avbryte «Ikke forstyrr»."</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Koblet til flere enheter"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Demomodus for systemgrensesnitt"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Mørkt tema"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"På / Midlertidig slått av på grunn av Batterisparing"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Midlertidig slått på for Batterisparing"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Støttede apper bytter også til mørkt tema"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Greit"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Innstillinger"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Koble til offentlige nettverk"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"nettverkstilkobling, internett, trådløs, data, wifi, wi-fi, wi fi, mobilnett, mobil, mobiloperatør, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Se nettverk som er trygge på fly"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Slå av flymodus"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Se nettverk for flymodus"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Slå av flymodus"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Tilkoblet"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Internett kobles ikke til automatisk"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Ingen andre nettverk er tilgjengelige"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Ingen nettverk er tilgjengelige"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Utilgjengelig fordi sengetidsmodus er på"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Tilbakestilling av viktighet for varsler er fullført."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Apper"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"En enhet som ikke er klarert, vil ha tilgang til meldingene dine. Trykk for å se mer informasjon."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Vil du gi tilgang til meldinger?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"En Bluetooth-enhet som ikke er klarert, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], vil ha tilgang til meldingene dine.\n\nDu har ikke koblet til [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] tidligere."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"En Bluetooth-enhet som ikke er klarert, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, vil ha tilgang til meldingene dine.\n\nDu har ikke koblet til <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> tidligere."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"En enhet som ikke er klarert, vil ha tilgang til kontaktene dine og samtaleloggen din. Trykk for å se mer informasjon."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Vil du gi tilgang til kontaktene og samtaleloggen?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"En Bluetooth-enhet som ikke er klarert, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], vil ha tilgang til kontaktene dine og samtaleloggen din. Dette inkluderer data om innkommende og utgående anrop.\n\nDu har ikke koblet til [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] tidligere."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"En Bluetooth-enhet som ikke er klarert, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, vil ha tilgang til kontaktene dine og samtaleloggen din. Dette inkluderer data om innkommende og utgående anrop.\n\nDu har ikke koblet til <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> tidligere."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Lysstyrke"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Lås skjermen"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Synlighet"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Farge"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Andre"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 3a811d9..cb6837c 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"समाप्त हुने समय"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"स्थिति"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"तीव्रता"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"निष्क्रिय / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"कहिले पनि स्वतः सक्रिय हुने छैन"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"<xliff:g id="ID_1">%1$s</xliff:g> मा स्वतः सक्रिय हुनेछ"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"सूर्यास्तको बेला स्वतः सक्रिय हुनेछ"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"सक्रिय / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"कहिल्यै पनि स्वतः निष्क्रिय हुने छैन"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"<xliff:g id="ID_1">%1$s</xliff:g> मा स्वतः निष्क्रिय हुनेछ"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"सूर्योदयको बेला स्वतः निष्क्रिय हुनेछ"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"सूर्यास्तदेखि सूर्योदयसम्म सक्रिय गर्छ"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"आफू अनुकूल समयमा सक्रिय हुन्छ"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"स्थिति"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"निष्क्रिय / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"कहिले पनि स्वतः सक्रिय हुने छैन"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"सूर्यास्तको बेला स्वतः सक्रिय हुने छ"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"<xliff:g id="ID_1">%1$s</xliff:g> मा स्वतः सक्रिय हुने छ"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"सक्रिय / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"कहिल्यै पनि स्वतः निष्क्रिय हुने छैन"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"सूर्योदयको बेला स्वतः निष्क्रिय हुने छ"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"<xliff:g id="ID_1">%1$s</xliff:g> मा स्वतः निष्क्रिय हुने छ"</string>
@@ -1611,11 +1607,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"एपहरू रिसेट गरिन सक्छ"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Wi-Fi, मोबाइल र ब्लुटुथ रिसेट गर्नुहोस्"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"यसले निम्न सेटिङहरू लगायत सम्पूर्ण नेटवर्क सम्बन्धी सेटिहरूलाई रिसेट गर्ने छ:\n\n"<li>"Wi‑Fi"</li>\n<li>"मोबाइल डेटा"</li>\n<li>"ब्लुटुथ"</li></string>
-    <!-- no translation found for erase_euicc_data_button (728078969563311737) -->
-    <skip />
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"मेटाउनुहोस्"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"डाउनलोड गरिएका SIM हरू मेट्नुहोस्"</string>
-    <!-- no translation found for reset_esim_desc (3662444090563399131) -->
-    <skip />
+    <string name="reset_esim_desc" msgid="3662444090563399131">"यसो गर्दा मोबाइल सेवाका कुनै पनि योजना रद्द हुने छैनन्। अर्को सिम डाउनलोड गर्न आफ्नो मोबाइल सेवा प्रदायकलाई सम्पर्क गर्नुहोस्।"</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"सेटिङहरू रिसेट गर्नुहोस्"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"नेटवर्कसम्बन्धी सबै सेटिङहरू रिसेट गर्ने हो? तपाईं यो कार्य उल्टाउन सक्नुहुन्न।"</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"नेटवर्कसम्बन्धी सबै सेटिङहरू रिसेट गर्ने र डाउनलोड गरिएका SIM हरू मेटाउने हो? तपाईं यस कार्यलाई अन्डू गर्न सक्नुहुन्न!"</string>
@@ -2138,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"स्क्रिन रिडरहरू"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"अडियो तथा स्क्रिनमा देखिने पाठ सन्देश"</string>
     <string name="display_category_title" msgid="6638191682294461408">"प्रदर्शन"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"अन्तर्क्रियाका नियन्त्रणहरू"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"डाउनलोड गरिएका एपहरू"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"प्रयोगात्मक"</string>
@@ -2458,8 +2454,7 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"ट्याब्लेट सामान्यभन्दा बढी प्रयोग भयो"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"यन्त्रलाई सामान्यभन्दा बढी प्रयोग भयो"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"ब्याट्री अरू बेलाभन्दा छिटै सकिन सक्छ"</string>
-    <!-- no translation found for battery_tip_limited_temporarily_title (7152799456221596915) -->
-    <skip />
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"ब्याट्री लामो समयसम्म टिक्ने बनाउन अप्टिमाइज गरिँदै छ"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"केही समयका लागि ब्याट्रीको प्रयोग सीमित गरिएको छ। थप जान्न ट्याप गर्नुहोस्।"</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"तपाईंको फोन सामान्यभन्दा धेरै प्रयोग भएको छ। तपाईंको ब्याट्रीको चार्ज अपेक्षा गरिएभन्दा चाँडो सकिन सक्छ।\n\nसबैभन्दा बढी ब्याट्री उपयोग गर्ने एपहरू:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"तपाईंको ट्याब्लेट सामान्यभन्दा धेरै प्रयोग भएको छ। तपाईंको ब्याट्रीको चार्ज अपेक्षा गरिएभन्दा चाँडो सकिन सक्छ।\n\nसबैभन्दा बढी ब्याट्री उपयोग गर्ने एपहरू:"</string>
@@ -3078,10 +3073,15 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"प्रयोगकर्ता मेटाउनुहोस्"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"मेट्नुहोस्"</string>
     <string name="user_guest" msgid="4545590092001460388">"अतिथि"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"अतिथि हटाउनुहोस्"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"अतिथि हटाउने हो?"</string>
+    <!-- no translation found for user_clear_guest_menu (4864362688187480452) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_menu (5064400453222497734) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_confirm_title (7526978959527761497) -->
+    <skip />
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"यस सत्रमा सबै एपहरू र डेटा मेटाइनेछ।"</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"हटाउनुहोस्"</string>
+    <!-- no translation found for user_exit_guest_dialog_remove (8095094235815676847) -->
+    <skip />
     <string name="user_enable_calling" msgid="264875360626905535">"फोन गर्ने सेवा सक्रिय गर्नुहोस्"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"फोन कल तथा SMS सक्षम पार्नुहोस्"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"प्रयोगकर्ता मेटाउनुहोस्"</string>
@@ -3349,13 +3349,13 @@
     <string name="notification_unknown_sound_title" msgid="1319708450698738980">"अनुप्रयोगले प्रदान गरेको ध्वनि"</string>
     <string name="notification_sound_default" msgid="8630353701915294299">"सूचना सम्बन्धी पूर्वनिर्धारित ध्वनि"</string>
     <string name="alarm_ringtone_title" msgid="6680761007731764726">"अलार्मको पूर्वनिर्धारित ध्वनि"</string>
-    <string name="vibrate_when_ringing_title" msgid="3436203665622843196">"कलका बेला कम्पन गर्नुहोस्"</string>
+    <string name="vibrate_when_ringing_title" msgid="3436203665622843196">"कल आउँदा भाइब्रेट गरियोस्"</string>
     <string name="keywords_vibrate_for_calls" msgid="1019870409730074899">"कम्पन"</string>
     <string name="vibrate_when_ringing_option_never_vibrate" msgid="6518980907289156517">"कहिल्यै पनि कम्पन नगर्नुहोस्"</string>
     <string name="vibrate_when_ringing_option_always_vibrate" msgid="968652667232075466">"सधैँ कम्पन गर्नुहोस्"</string>
     <string name="vibrate_when_ringing_option_ramping_ringer" msgid="2798848945803840348">"सुरुमा कम्पन गरी त्यसपछि घन्टी बजाउनुहोस्"</string>
     <string name="other_sound_settings" msgid="5468360269346162072">"अन्य ध्वनिहरू"</string>
-    <string name="dial_pad_tones_title" msgid="3536945335367914892">"प्याड टोनहरू डायल गर्नुहोस्"</string>
+    <string name="dial_pad_tones_title" msgid="3536945335367914892">"डायल प्याडको टोन"</string>
     <string name="screen_locking_sounds_title" msgid="5695030983872787321">"स्क्रिन लक हुँदा बज्ने ध्वनि"</string>
     <string name="charging_sounds_title" msgid="5261683808537783668">"चार्ज गर्दाको ध्वनि तथा कम्पन"</string>
     <string name="docking_sounds_title" msgid="5341616179210436159">"डाकिंग आवाज"</string>
@@ -3594,7 +3594,8 @@
     <string name="other_conversations" msgid="551178916855139870">"कम महत्त्वपूर्ण वार्तालापहरू"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"तपाईंले केही कुराहरू परिवर्तन गर्नुभएका वार्तालापहरू"</string>
     <string name="recent_conversations" msgid="471678228756995274">"हालैका वार्तालापहरू"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"हालका वार्तालाप हटाउनु…"</string>
+    <!-- no translation found for conversation_settings_clear_recents (4246342656145488662) -->
+    <skip />
     <string name="clear" msgid="5092178335409471100">"हटाउनुहोस्"</string>
     <string name="important_bubble" msgid="7911698275408390846">"महत्त्वपूर्ण वार्तालापहरू बबलमा देखाइयोस्"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"महत्त्वपूर्ण वार्तालापहरू पुल डाउन सेडका सिरानमा देखिन्छन्। तपाईं वार्तालापहरूलाई बबलका रूपमा देखिने र बाधा नपुर्‍याउनुहोस् नामक मोड निष्क्रिय पार्ने गरी सेट गर्न पनि सक्नुहुन्छ।"</string>
@@ -4427,7 +4428,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"धेरै यन्त्रहरूमा जडान गरियो"</string>
     <string name="demo_mode" msgid="6566167465451386728">"प्रणालीको UI को प्रदर्शन मोड"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"अँध्यारो थिम"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"सक्रिय / ब्याट्री सेभर सक्रिय भएकाले अस्थायी रूपमा असक्षम पारिएको छ"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"ब्याट्री सेभरका कारण अस्थायी रूपमा सक्रिय गरिएको"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"समर्थन गरिएका एपहरू पनि बदलिएर गाढा विषयवस्तुमा जाने छन्"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"बुझेँ"</string>
@@ -5066,21 +5068,34 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"प्राथमिकताहरू"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"सार्वजनिक Wi-Fi नेटवर्कमा कनेक्ट गरियोस्"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"नेटवर्क कनेक्सन, इन्टरनेट, वायरलेस, डेटा, wifi, wi-fi, wi fi, सेलुलर, मोबाइल, सेल सेवा प्रदायक, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"हवाइजहाजमा सुरक्षित रूपमा प्रयोग गर्न सकिने नेटवर्कहरू हेर्नु…"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"हवाइजहाज मोड अफ गर्नुहोस्"</string>
+    <!-- no translation found for view_airplane_safe_networks (9170023210981508906) -->
+    <skip />
+    <!-- no translation found for turn_off_airplane_mode (7141986366534514443) -->
+    <skip />
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"इन्टरनेटमा कनेक्ट गरिएको छ"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"इन्टरनेट स्वतः कनेक्ट हुँदैन"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"अन्य नेटवर्क उपलब्ध छैनन्"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"कुनै पनि नेटवर्क उपलब्ध छैन"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"बेडटाइम मोड अन हुँदा यो सुविधाले काम गर्दैन"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"सूचनाको प्राथमिकता रिसेट गर्ने कार्य पूरा भयो।"</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"एपहरू"</string>
-    <!-- no translation found for bluetooth_message_access_notification_content (2986108412562309009) -->
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"कुनै अविश्वसनीय यन्त्र तपाईंका म्यासेजहरू हेर्न चाहन्छ। थप जानकारी हेर्न ट्याप गर्नुहोस्।"</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"यस यन्त्रलाई म्यासेजहरू हेर्न दिने हो?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"यसअघि तपाईंको यन्त्रसँग कनेक्ट नगरिएको ब्लुटुथ चल्ने यन्त्र (<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>) तपाईंका म्यासेजहरू हेर्ने अनुमति माग्दै छ।\n\nयसअघि तपाईंको यन्त्र <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> सँग कनेक्ट भएको थिएन।"</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"कुनै अविश्वसनीय यन्त्र तपाईंका सम्पर्क ठेगानाहरू र कल लग हेर्न तथा प्रयोग गर्न चाहन्छ। थप जानकारी हेर्न ट्याप गर्नुहोस्।"</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"यस यन्त्रलाई तपाईंका सम्पर्क ठेगानाहरू र कल लग हेर्न तथा प्रयोग गर्न हो?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"यसअघि तपाईंको यन्त्रसँग कनेक्ट नगरिएको ब्लुटुथ चल्ने यन्त्र (<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>) तपाईंका सम्पर्क ठेगाना तथा कल लग हेर्ने अनुमति माग्दै छ। यसका साथै, उक्त यन्त्रले तपाईंका आगमन तथा बहिर्गमन कलसम्बन्धी डेटा पनि हेर्ने तथा प्रयोग गर्ने अनुमति माग्दै छ।\n\nयसअघि तपाईंको यन्त्र <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> सँग कनेक्ट भएको थिएन।"</string>
+    <!-- no translation found for category_name_brightness (8520372392029305084) -->
     <skip />
-    <!-- no translation found for bluetooth_message_access_dialog_title (9009836130395061579) -->
+    <!-- no translation found for category_name_lock_display (7478785189102882266) -->
     <skip />
-    <!-- no translation found for bluetooth_message_access_dialog_content (6004506637437582983) -->
+    <!-- no translation found for category_name_visibility (4485030512199246405) -->
     <skip />
-    <!-- no translation found for bluetooth_phonebook_access_notification_content (4280361621526852063) -->
+    <!-- no translation found for category_name_color (937514550918977151) -->
     <skip />
-    <!-- no translation found for bluetooth_phonebook_access_dialog_title (7624607995928968721) -->
+    <!-- no translation found for category_name_others (2366006298768550310) -->
     <skip />
-    <!-- no translation found for bluetooth_phonebook_access_dialog_content (2235876209172857819) -->
+    <!-- no translation found for category_name_general (7737273712848115886) -->
     <skip />
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 06d7c71..745a7dc 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Eindtijd"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Status"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intensiteit"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Uit / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Wordt nooit automatisch ingeschakeld"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Wordt automatisch ingeschakeld om <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Wordt automatisch ingeschakeld bij zonsondergang"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Aan / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Wordt nooit automatisch uitgeschakeld"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Wordt automatisch uitgeschakeld om <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Wordt automatisch uitgeschakeld bij zonsopgang"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Van zonsondergang tot zonsopgang"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Op aangepaste tijd"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Status"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Uit / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Wordt nooit automatisch ingeschakeld"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Wordt automatisch ingeschakeld bij zonsondergang"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Wordt automatisch ingeschakeld om <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Aan / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Wordt nooit automatisch uitgeschakeld"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Wordt automatisch uitgeschakeld bij zonsopgang"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Wordt automatisch uitgeschakeld om <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Schermlezers"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio en tekst op het scherm"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Scherm"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Interactieopties"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Gedownloade apps"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Experimenteel"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Gebruiker verwijderen"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Verwijderen"</string>
     <string name="user_guest" msgid="4545590092001460388">"Gast"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Gast verwijderen"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Gast verwijderen?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Gastgegevens wissen"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Gastsessie beëindigen"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Gastsessie beëindigen?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Alle apps en gegevens in deze sessie worden verwijderd."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Verwijderen"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Sessie beëindigen"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Telefoonoproepen inschakelen"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Telefoonoproepen en sms inschakelen"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Gebruiker verwijderen"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Niet-prioriteitsgesprekken"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Gesprekken waarin je wijzigingen hebt aangebracht"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Recente gesprekken"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Recente items wissen"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Alle recente wissen"</string>
     <string name="clear" msgid="5092178335409471100">"Wissen"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Prioriteitsgesprekken als bubbel weergeven"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Prioriteitsgesprekken worden bovenaan het pull-downvenster weergegeven. Je kunt ook instellen dat ze als bubbels worden weergegeven en \'Niet storen\' onderbreken."</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Verbonden met meerdere apparaten"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Demomodus voor systeemgebruikersinterface"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Donker thema"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Aan / Tijdelijk uitgeschakeld vanwege Batterijbesparing"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Tijdelijk ingeschakeld vanwege Batterijbesparing"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Ondersteunde apps krijgen ook een donker thema"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"OK"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Voorkeuren"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Verbinden met openbare netwerken"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"netwerkverbinding, internet, draadloos, data, wifi, wi-fi, wi fi, mobiel, mobiele provider, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Netwerken bekijken die geschikt zijn voor vliegtuigen"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Vliegtuigmodus uitschakelen"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Netwerken voor vliegtuigmodus bekijken"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Vliegtuigmodus uitzetten"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Verbonden"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet maakt niet automatisch verbinding"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Geen andere netwerken beschikbaar"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Geen netwerken beschikbaar"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Niet beschikbaar omdat de bedtijdstand is ingeschakeld"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Belang van meldingen is gereset."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Apps"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Een niet-vertrouwd apparaat wil toegang tot je berichten. Tik voor details."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Toegang tot berichten toestaan?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Een niet-vertrouwd bluetooth-apparaat, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], wil toegang tot je berichten.\n\nJe hebt niet eerder verbinding gemaakt met [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Een niet-vertrouwd bluetooth-apparaat, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, wil toegang tot je berichten.\n\nJe hebt niet eerder verbinding gemaakt met <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Een niet-vertrouwd apparaat wil toegang tot je contacten en gesprekslijst. Tik voor details."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Toegang tot contacten en gesprekslijst toestaan?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Een niet-vertrouwd bluetooth-apparaat, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], wil toegang tot je contacten en gesprekslijst. Dit omvat gegevens over inkomende en uitgaande gesprekken.\n\nJe hebt niet eerder verbinding gemaakt met [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Een niet-vertrouwd bluetooth-apparaat, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, wil toegang tot je contacten en gesprekslijst. Dit omvat gegevens over inkomende en uitgaande gesprekken.\n\nJe hebt niet eerder verbinding gemaakt met <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Helderheid"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Vergrendelscherm"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Zichtbaarheid"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Kleur"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Overig"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index f9094fb..8437629 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"ସମାପ୍ତ ସମୟ"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"ସ୍ଥିତି"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"ତୀବ୍ରତା"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"ବନ୍ଦ‌ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"ଆଦୌ ସ୍ୱଚାଳିତ ଭାବେ ଚାଲୁ ହେବନାହିଁ"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"<xliff:g id="ID_1">%1$s</xliff:g> ରେ ସ୍ୱଚାଳିତ ଭାବେ ଅନ୍‌ ହେବ।"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"ସୂର୍ଯ୍ୟାସ୍ତରେ ସ୍ୱଚାଳିତ ଭାବେ ଅନ୍‌ ହେବ।"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"ଅନ୍‌ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"କେବେବି ନିଜକୁ ନିଜ ବନ୍ଦ ହେବନାହିଁ"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"<xliff:g id="ID_1">%1$s</xliff:g> ରେ ସ୍ୱଚାଳିତ ଭାବେ ଅଫ୍‌ କରିବ।"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"ସୂର୍ଯ୍ୟଦୋୟରେ ସ୍ୱଚାଳିତ ଭାବେ ଅଫ୍‌ ହେବ।"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"ସନ୍ଧ୍ୟାରୁ ସକାଳ ଯାଏଁ ଚାଲୁ ରହେ"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"କଷ୍ଟମ୍ ସମୟରେ ଚାଲୁ ହୁଏ"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"ସ୍ଥିତି"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"ବନ୍ଦ ଅଛି / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"କେବେ ବି ସ୍ୱଚାଳିତ ଭାବେ ଚାଲୁ ହେବ ନାହିଁ"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"ସନ୍ଧ୍ୟାରେ ସ୍ୱଚାଳିତ ଭାବେ ଚାଲୁ ହେବ"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"<xliff:g id="ID_1">%1$s</xliff:g>ରେ ସ୍ୱଚାଳିତ ଭାବେ ଚାଲୁ ହେବ"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"ଚାଲୁ ଅଛି / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"କେବେ ବି ସ୍ୱଚାଳିତ ଭାବେ ବନ୍ଦ ହେବନାହିଁ"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"ସକାଳେ ସ୍ୱଚାଳିତ ଭାବେ ବନ୍ଦ ହେବ"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"<xliff:g id="ID_1">%1$s</xliff:g>ରେ ସ୍ୱଚାଳିତ ଭାବେ ବନ୍ଦ ହେବ"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"ସ୍କ୍ରିନ୍‌ ରିଡର୍"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ଅଡିଓ ଓ ଅନ୍-ସ୍କ୍ରିନ୍ ଟେକ୍ସଟ୍"</string>
     <string name="display_category_title" msgid="6638191682294461408">"ଡିସ୍‌ପ୍ଲେ"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"ଇଣ୍ଟରାକସନ୍‌ ନିୟନ୍ତ୍ରଣ"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"ଡାଉନଲୋଡ୍ ହୋଇଥିବା ଆପ୍ସ"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"ପରୀକ୍ଷାମୂଳକ"</string>
@@ -3075,10 +3073,15 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"ଉପଯୋଗକର୍ତ୍ତାଙ୍କୁ ଡିଲିଟ୍‌ କରନ୍ତୁ"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"ଡିଲିଟ୍‌ କରନ୍ତୁ"</string>
     <string name="user_guest" msgid="4545590092001460388">"ଅତିଥି"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"ଅତିଥି ଅପସାରଣ କରନ୍ତୁ"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"ଅତିଥିଙ୍କୁ କାଢ଼ିଦେବେ?"</string>
+    <!-- no translation found for user_clear_guest_menu (4864362688187480452) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_menu (5064400453222497734) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_confirm_title (7526978959527761497) -->
+    <skip />
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"ଏହି ସେସନ୍‌ର ସମସ୍ତ ଆପ୍‌ ଏବଂ ଡାଟା ଡିଲିଟ୍‍ ହୋଇଯିବ।"</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"କାଢିଦିଅନ୍ତୁ"</string>
+    <!-- no translation found for user_exit_guest_dialog_remove (8095094235815676847) -->
+    <skip />
     <string name="user_enable_calling" msgid="264875360626905535">"ଫୋନ୍‌ କଲ୍‌ ଚାଲୁ କରନ୍ତୁ"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"ଫୋନ୍‌ କଲ୍‌ ଓ SMS ଚାଲୁ କରନ୍ତୁ"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"ଉପଯୋଗକର୍ତ୍ତାଙ୍କୁ ଡିଲିଟ୍‌ କରନ୍ତୁ"</string>
@@ -3591,7 +3594,8 @@
     <string name="other_conversations" msgid="551178916855139870">"ପ୍ରାଥମିକତା ନଥିବା ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକରେ ଆପଣ କରିଥିବା ପରିବର୍ତ୍ତନଗୁଡ଼ିକ"</string>
     <string name="recent_conversations" msgid="471678228756995274">"ବର୍ତ୍ତମାନର ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"ବର୍ତ୍ତମାନର ଖାଲି କର"</string>
+    <!-- no translation found for conversation_settings_clear_recents (4246342656145488662) -->
+    <skip />
     <string name="clear" msgid="5092178335409471100">"ଖାଲି କରନ୍ତୁ"</string>
     <string name="important_bubble" msgid="7911698275408390846">"ପ୍ରାଥମିକତା ଦିଆଯାଉଥିବା ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକୁ ବବଲ୍ କରନ୍ତୁ"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"ପ୍ରାଥମିକତା ଦିଆଯାଉଥିବା ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ ପୁଲ୍-ଡାଉନ୍ ସେଡର ଶୀର୍ଷରେ ଦେଖାନ୍ତୁ। ଆପଣ ସେଗୁଡ଼ିକୁ ବବଲ୍ ଭାବେ ମଧ୍ୟ ସେଟ୍ କରିପାରିବେ ଏବଂ \'ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\' ମୋଡକୁ ବାଧା ଦେଇପାରିବେ।"</string>
@@ -4424,7 +4428,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"ଏକାଧିକ ଡିଭାଇସ୍‌ରେ ସଂଯୁକ୍ତ"</string>
     <string name="demo_mode" msgid="6566167465451386728">"ସିଷ୍ଟମ୍‌ UI ଡେମୋ ମୋଡ୍‌"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"ଗାଢ଼ ଥିମ୍"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"ଚାଲୁ ଅଛି / ବ୍ୟାଟେରୀ ସେଭର୍ ଯୋଗୁଁ ଅସ୍ଥାୟୀରୂପେ ଅକ୍ଷମ କରାଯାଇଛି"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"ବ୍ୟାଟେରୀ ସେଭର୍ ଯୋଗୁଁ ଅସ୍ଥାୟୀରୂପେ ଚାଲୁ କରାଯାଇଛି"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"ସମର୍ଥିତ ଆପ୍ସରେ ମଧ୍ୟ ଗାଢ଼ା ଥିମ୍ ବ୍ୟବହାର ହେବ"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"ବୁଝିଗଲି"</string>
@@ -5063,15 +5068,34 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ପସନ୍ଦଗୁଡ଼ିକ"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ସାର୍ବଜନୀନ ନେଟୱାର୍କଗୁଡ଼ିକ ସହ ସଂଯୋଗ କରନ୍ତୁ"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ନେଟୱାର୍କ ସଂଯୋଗ, ଇଣ୍ଟରନେଟ୍, ୱାୟାରଲେସ୍, ଡାଟା, ୱାଇଫାଇ, ୱାଇ-ଫାଇ, ୱାଇ ଫାଇ, ସେଲ୍ୟୁଲାର୍, ମୋବାଇଲ, ସେଲ୍ କ୍ୟାରିଅର୍, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"ଏୟାରପ୍ଲେନ୍-ସେଫ୍ ନେଟୱାର୍କଗୁଡ଼ିକୁ ଦେଖନ୍ତୁ"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"ଏୟାରପ୍ଲେନ୍ ମୋଡକୁ ବନ୍ଦ କରନ୍ତୁ"</string>
+    <!-- no translation found for view_airplane_safe_networks (9170023210981508906) -->
+    <skip />
+    <!-- no translation found for turn_off_airplane_mode (7141986366534514443) -->
+    <skip />
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"ସଂଯୋଗ କରାଯାଇଛି"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"ଇଣ୍ଟରନେଟ୍ ସ୍ଵତଃ-ସଂଯୋଗ କରିବ ନାହିଁ"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"ଅନ୍ୟ କୌଣସି ନେଟୱାର୍କ ଉପଲବ୍ଧ ନାହିଁ"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"କୌଣସି ନେଟୱାର୍କ ଉପଲବ୍ଧ ନାହିଁ"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"ଶୋଇବା ସମୟ ମୋଡ୍ ଚାଲୁ ଥିବା ଯୋଗୁଁ ଉପଲବ୍ଧ ନାହିଁ"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"ବିଜ୍ଞପ୍ତିର ପ୍ରାଥମିକତା ରିସେଟ୍ କରିବା ସମ୍ପୂର୍ଣ୍ଣ ହୋଇଛି।"</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"ଆପଗୁଡ଼ିକ"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"ଅବିଶ୍ୱସ୍ତ ଡିଭାଇସଟି ଆପଣଙ୍କ ମେସେଜଗୁଡ଼ିକୁ ଆକ୍ସେସ୍ କରିବାକୁ ଚାହୁଁଛି। ବିବରଣୀ ପାଇଁ ଟାପ୍ କରନ୍ତୁ।"</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"ମେସେଜଗୁଡ଼ିକୁ ଆକ୍ସେସ୍ କରିବା ପାଇଁ ଅନୁମତି ଦେବେ?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"ଏକ ଅବିଶ୍ୱସ୍ତ ବ୍ଲୁଟୁଥ୍ ଡିଭାଇସ୍, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ଆପଣଙ୍କ ମେସେଜଗୁଡ଼ିକୁ ଆକ୍ସେସ୍ କରିବାକୁ ଚାହେଁ।\n\nଆପଣ [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ସହ ପୂର୍ବରୁ ସଂଯୁକ୍ତ ହୋଇନାହାଁନ୍ତି।"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"ଏକ ଅବିଶ୍ୱସ୍ତ ବ୍ଲୁଟୁଥ୍ ଡିଭାଇସ୍, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ଆପଣଙ୍କ ମେସେଜଗୁଡ଼ିକୁ ଆକ୍ସେସ୍ କରିବାକୁ ଚାହେଁ।\n\nଆପଣ ପୂର୍ବରୁ [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ସହ ସଂଯୁକ୍ତ ହୋଇନାହାଁନ୍ତି।"</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"ଅବିଶ୍ୱସ୍ତ ଡିଭାଇସଟି ଆପଣଙ୍କ ଯୋଗାଯୋଗ ଏବଂ କଲ୍ ଲଗକୁ ଆକ୍ସେସ୍ କରିବାକୁ ଚାହେଁ। ବିବରଣୀ ପାଇଁ ଟାପ୍ କରନ୍ତୁ।"</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"ଯୋଗାଯୋଗ ଏବଂ କଲ୍ ଲଗକୁ ଆକ୍ସେସ୍ କରିବା ପାଇଁ ଅନୁମତି ଦେବେ?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"ଏକ ଅବିଶ୍ୱସ୍ତ ବ୍ଲୁଟୁଥ୍ ଡିଭାଇସ୍, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ଆପଣଙ୍କ ଯୋଗାଯୋଗ ଏବଂ କଲ୍ ଲଗକୁ ଆକ୍ସେସ୍ କରିବାକୁ ଚାହେଁ। ଏଥିରେ ଇନକମିଂ ଏବଂ ଆଉଟଗୋଇଂ କଲଗୁଡ଼ିକ ବିଷୟରେ ଡାଟା ଅନ୍ତର୍ଭୁକ୍ତ ଅଛି।\n\nଆପଣ ପୂର୍ବରୁ [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ସହ ସଂଯୁକ୍ତ ହୋଇନାହାଁନ୍ତି।"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"ଏକ ଅବିଶ୍ୱସ୍ତ ବ୍ଲୁଟୁଥ୍ ଡିଭାଇସ୍, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ଆପଣଙ୍କ ଯୋଗାଯୋଗ ଏବଂ କଲ୍ ଲଗକୁ ଆକ୍ସେସ୍ କରିବାକୁ ଚାହେଁ। ଏଥିରେ ଇନକମିଂ ଏବଂ ଆଉଟଗୋଇଂ କଲଗୁଡ଼ିକ ବିଷୟରେ ଡାଟା ଅନ୍ତର୍ଭୁକ୍ତ ଅଛି।\n\nଆପଣ ପୂର୍ବରୁ [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ସହ ସଂଯୁକ୍ତ ହୋଇନାହାଁନ୍ତି।"</string>
+    <!-- no translation found for category_name_brightness (8520372392029305084) -->
+    <skip />
+    <!-- no translation found for category_name_lock_display (7478785189102882266) -->
+    <skip />
+    <!-- no translation found for category_name_visibility (4485030512199246405) -->
+    <skip />
+    <!-- no translation found for category_name_color (937514550918977151) -->
+    <skip />
+    <!-- no translation found for category_name_others (2366006298768550310) -->
+    <skip />
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index d3bc5e4..9ab6a41 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"ਸਮਾਪਤੀ ਦਾ ਸਮਾਂ"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"ਸਥਿਤੀ"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"ਤੀਬਰਤਾ"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"ਬੰਦ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"ਆਪਣੇ ਆਪ ਕਦੇ ਵੀ ਚਾਲੂ ਨਹੀਂ ਹੋਵੇਗੀ"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"<xliff:g id="ID_1">%1$s</xliff:g> ਵਜੇ ਆਪਣੇ ਆਪ ਚਾਲੂ ਹੋ ਜਾਵੇਗੀ"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"ਸੂਰਜ ਡੁੱਬਣ ਸਮੇਂ ਆਪਣੇ ਆਪ ਚਾਲੂ ਹੋ ਜਾਵੇਗੀ"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"ਚਾਲੂ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"ਆਪਣੇ ਆਪ ਕਦੇ ਵੀ ਬੰਦ ਨਹੀਂ ਹੋਵੇਗੀ"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"<xliff:g id="ID_1">%1$s</xliff:g> ਨੂੰ ਆਪਣੇ ਆਪ ਬੰਦ ਹੋ ਜਾਵੇਗੀ"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"ਸੂਰਜ ਚੜ੍ਹਨ ਸਮੇਂ ਆਪਣੇ ਆਪ ਬੰਦ ਹੋ ਜਾਵੇਗੀ"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"ਸੂਰਜ ਡੁੱਬਣ ਤੋਂ ਚੜ੍ਹਨ ਤੱਕ ਚਾਲੂ"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"ਵਿਉਂਂਤੇ ਸਮੇਂ \'ਤੇ ਚਾਲੂ ਹੁੰਦੀ ਹੈ"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"ਸਥਿਤੀ"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"ਬੰਦ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"ਆਪਣੇ ਆਪ ਕਦੇ ਵੀ ਚਾਲੂ ਨਹੀਂ ਹੋਵੇਗਾ"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"ਸੂਰਜ ਡੁੱਬਣ ਸਮੇਂ ਆਪਣੇ ਆਪ ਚਾਲੂ ਹੋ ਜਾਵੇਗਾ"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"<xliff:g id="ID_1">%1$s</xliff:g> ਵਜੇ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਹੋ ਜਾਵੇਗੀ"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"ਚਾਲੂ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"ਆਪਣੇ ਆਪ ਕਦੇ ਵੀ ਬੰਦ ਨਹੀਂ ਹੋਵੇਗਾ"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"ਸੂਰਜ ਚੜ੍ਹਨ ਸਮੇਂ ਆਪਣੇ ਆਪ ਬੰਦ ਹੋ ਜਾਵੇਗਾ"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"<xliff:g id="ID_1">%1$s</xliff:g> ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਬੰਦ ਹੋ ਜਾਵੇਗੀ"</string>
@@ -1611,11 +1607,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"ਐਪਾਂ ਨੂੰ ਰੀਸੈੱਟ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"ਵਾਈ-ਫਾਈ, ਮੋਬਾਈਲ ਅਤੇ ਬਲੂਟੁੱਥ ਨੂੰ ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"ਇਹ ਨੈੱਟਵਰਕ ਦੀਆਂ ਸਾਰੀਆਂ ਸੈਟਿੰਗਾਂ ਨੂੰ ਰੀਸੈੱਟ ਕਰੇਗਾ, ਜਿਸ ਵਿੱਚ ਇਹ ਸ਼ਾਮਲ ਹਨ:\n\n"<li>"ਵਾਈ-ਫਾਈ"</li>\n<li>"ਮੋਬਾਈਲ ਡਾਟਾ"</li>\n<li>"ਬਲੂਟੁੱਥ"</li></string>
-    <!-- no translation found for erase_euicc_data_button (728078969563311737) -->
-    <skip />
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"ਮਿਟਾਓ"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"ਡਾਊਨਲੋਡ ਕੀਤੇ ਸਿਮ ਮਿਟਾਓ"</string>
-    <!-- no translation found for reset_esim_desc (3662444090563399131) -->
-    <skip />
+    <string name="reset_esim_desc" msgid="3662444090563399131">"ਇੰਝ ਕਰਨ ਨਾਲ ਕੋਈ ਮੋਬਾਈਲ ਸੇਵਾ ਪਲਾਨ ਰੱਦ ਨਹੀਂ ਹੋਵੇਗਾ। ਵਟਾਵੇਂ ਸਿਮ ਡਾਊਨਲੋਡ ਕਰਨ ਲਈ, ਆਪਣੇ ਕੈਰੀਅਰ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"ਸੈਟਿੰਗਾਂ ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"ਕੀ ਸਾਰੀਆਂ ਨੈੱਟਵਰਕ ਸੈਟਿੰਗਾਂ ਰੀਸੈੱਟ ਕਰਨੀਆਂ ਹਨ? ਤੁਸੀਂ ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਅਣਕੀਤਾ ਨਹੀਂ ਕਰ ਸਕਦੇ।"</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"ਕੀ ਸਾਰੀਆਂ ਨੈੱਟਵਰਕ ਸੈਟਿੰਗਾਂ ਰੀਸੈੱਟ ਕਰਕੇ ਡਾਊਨਲੋਡ ਕੀਤੇ ਸਿਮ ਮਿਟਾਉਣੇ ਹਨ? ਤੁਸੀਂ ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਅਣਕੀਤਾ ਨਹੀਂ ਕਰ ਸਕਦੇ।"</string>
@@ -2138,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"ਸਕ੍ਰੀਨ ਰੀਡਰ"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ਆਡੀਓ ਅਤੇ ਆਨ-ਸਕ੍ਰੀਨ ਲਿਖਤ"</string>
     <string name="display_category_title" msgid="6638191682294461408">"ਡਿਸਪਲੇ"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"ਅੰਤਰਕਿਰਿਆ ਕੰਟਰੋਲ"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਐਪਾਂ"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"ਪ੍ਰਯੋਗਮਈ"</string>
@@ -2458,9 +2454,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"ਟੈਬਲੈੱਟ ਦੀ ਵਰਤੋਂ ਆਮ ਨਾਲੋਂ ਜ਼ਿਆਦਾ ਹੋਈ ਹੈ"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"ਡੀਵਾਈਸ ਦੀ ਵਰਤੋਂ ਆਮ ਨਾਲੋਂ ਜ਼ਿਆਦਾ ਹੋਈ ਹੈ"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"ਬੈਟਰੀ ਆਮ ਨਾਲੋਂ ਪਹਿਲਾਂ ਖਤਮ ਹੋ ਸਕਦੀ ਹੈ"</string>
-    <!-- no translation found for battery_tip_limited_temporarily_title (7152799456221596915) -->
-    <skip />
-    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"ਬੈਟਰੀ ਕੁਝ ਸਮੇਂ ਲਈ ਸੀਮਤ। ਹੋਰ ਜਾਣਨ ਲਈ ਟੈਪ ਕਰੋ।"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"ਬੈਟਰੀ ਦੀ ਸਥਿਤੀ ਲਈ ਸੁਯੋਗ ਬਣਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"ਬੈਟਰੀ ਕੁਝ ਸਮੇਂ ਲਈ ਸੀਮਤ ਹੈ। ਹੋਰ ਜਾਣਨ ਲਈ ਟੈਪ ਕਰੋ।"</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"ਤੁਹਾਡੇ ਫ਼ੋਨ ਦੀ ਵਰਤੋਂ ਆਮ ਨਾਲੋਂ ਜ਼ਿਆਦਾ ਕੀਤੀ ਗਈ ਹੈ। ਤੁਹਾਡੀ ਬੈਟਰੀ ਸ਼ਾਇਦ ਉਮੀਦ ਨਾਲੋਂ ਛੇਤੀ ਮੁੱਕ ਜਾਵੇ।\n\nਬੈਟਰੀ ਵਰਤੋਂ ਮੁਤਾਬਕ ਪ੍ਰਮੁੱਖ ਐਪਾਂ:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਦੀ ਵਰਤੋਂ ਆਮ ਨਾਲੋਂ ਜ਼ਿਆਦਾ ਕੀਤੀ ਗਈ ਹੈ। ਤੁਹਾਡੀ ਬੈਟਰੀ ਸ਼ਾਇਦ ਉਮੀਦ ਨਾਲੋਂ ਛੇਤੀ ਮੁੱਕ ਜਾਵੇ।\n\nਬੈਟਰੀ ਵਰਤੋਂ ਮੁਤਾਬਕ ਪ੍ਰਮੁੱਖ ਐਪਾਂ:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਦੀ ਵਰਤੋਂ ਆਮ ਨਾਲੋਂ ਜ਼ਿਆਦਾ ਕੀਤੀ ਗਈ ਹੈ। ਤੁਹਾਡੀ ਬੈਟਰੀ ਸ਼ਾਇਦ ਉਮੀਦ ਨਾਲੋਂ ਛੇਤੀ ਮੁੱਕ ਜਾਵੇ।\n\nਬੈਟਰੀ ਵਰਤੋਂ ਮੁਤਾਬਕ ਪ੍ਰਮੁੱਖ ਐਪਾਂ:"</string>
@@ -3078,10 +3073,15 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"ਵਰਤੋਂਕਾਰ ਨੂੰ ਮਿਟਾਓ"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"ਮਿਟਾਓ"</string>
     <string name="user_guest" msgid="4545590092001460388">"ਮਹਿਮਾਨ"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"ਮਹਿਮਾਨ ਹਟਾਓ"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"ਕੀ ਮਹਿਮਾਨ ਹਟਾਉਣਾ ਹੈ?"</string>
+    <!-- no translation found for user_clear_guest_menu (4864362688187480452) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_menu (5064400453222497734) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_confirm_title (7526978959527761497) -->
+    <skip />
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"ਇਸ ਸੈਸ਼ਨ ਵਿੱਚ ਸਾਰੀਆਂ ਐਪਾਂ ਅਤੇ ਡਾਟਾ ਨੂੰ ਮਿਟਾ ਦਿੱਤਾ ਜਾਏਗਾ।"</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"ਹਟਾਓ"</string>
+    <!-- no translation found for user_exit_guest_dialog_remove (8095094235815676847) -->
+    <skip />
     <string name="user_enable_calling" msgid="264875360626905535">"ਫ਼ੋਨ ਕਾਲਾਂ ਚਾਲੂ ਕਰੋ"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"ਫ਼ੋਨ ਕਾਲਾਂ ਅਤੇ SMS ਚਾਲੂ ਕਰੋ"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"ਵਰਤੋਂਕਾਰ ਨੂੰ ਮਿਟਾਓ"</string>
@@ -3594,7 +3594,8 @@
     <string name="other_conversations" msgid="551178916855139870">"ਗੈਰ-ਤਰਜੀਹੀ ਗੱਲਾਂਬਾਤਾਂ"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"ਜਿਨ੍ਹਾਂ ਗੱਲਾਂਬਾਤਾਂ ਵਿੱਚ ਤੁਸੀਂ ਤਬਦੀਲੀਆਂ ਕੀਤੀਆਂ ਹਨ"</string>
     <string name="recent_conversations" msgid="471678228756995274">"ਹਾਲੀਆ ਗੱਲਾਂਬਾਤਾਂ"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"ਹਾਲੀਆ ਗੱਲਬਾਤ ਕਲੀਅਰ ਕਰੋ"</string>
+    <!-- no translation found for conversation_settings_clear_recents (4246342656145488662) -->
+    <skip />
     <string name="clear" msgid="5092178335409471100">"ਕਲੀਅਰ ਕਰੋ"</string>
     <string name="important_bubble" msgid="7911698275408390846">"ਤਰਜੀਹੀ ਗੱਲਾਂਬਾਤਾਂ ਨੂੰ ਬਬਲ ਵਜੋਂ ਦਿਖਾਓ"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"ਤਰਜੀਹੀ ਗੱਲਾਂਬਾਤਾਂ ਹੇਠਾਂ ਖਿੱਚੀ ਜਾਣ ਵਾਲੀ ਸੂਚੀ ਦੇ ਸਿਖਰ \'ਤੇ ਦਿਸਦੀਆਂ ਹਨ। ਤੁਸੀਂ ਇਹਨਾਂ ਨੂੰ ਬਬਲ \'ਤੇ ਵੀ ਸੈੱਟ ਕਰਕੇ \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਮੋਡ ਨੂੰ ਰੋਕ ਸਕਦੇ ਹੋ।"</string>
@@ -4427,7 +4428,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"ਇੱਕ ਤੋਂ ਜ਼ਿਆਦਾ ਡੀਵਾਈਸਾਂ ਨਾਲ ਕਨੈਕਟ ਹੈ"</string>
     <string name="demo_mode" msgid="6566167465451386728">"ਸਿਸਟਮ UI ਡੈਮੋ ਮੋਡ"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"ਗੂੜ੍ਹਾ ਥੀਮ"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"ਚਾਲੂ / ਬੈਟਰੀ ਸੇਵਰ ਕਰਕੇ ਅਸਥਾਈ ਤੌਰ \'ਤੇ ਬੰਦ ਕੀਤਾ ਗਿਆ"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"ਬੈਟਰੀ ਸੇਵਰ ਕਰਕੇ ਅਸਥਾਈ ਤੌਰ \'ਤੇ ਚਾਲੂ ਕੀਤਾ ਗਿਆ"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"ਸਮਰਥਿਤ ਐਪਾਂ ਵੀ ਗੂੜ੍ਹੇ ਥੀਮ ਵਿੱਚ ਚੱਲਣਗੀਆਂ"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"ਸਮਝ ਲਿਆ"</string>
@@ -5066,21 +5068,39 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ਤਰਜੀਹਾਂ"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ਜਨਤਕ ਨੈੱਟਵਰਕਾਂ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ, ਇੰਟਰਨੈੱਟ, ਵਾਇਰਲੈੱਸ, ਡਾਟਾ, ਵਾਈ-ਫਾਈ, ਸੈਲਿਊਲਰ, ਮੋਬਾਈਲ, ਸੈੱਲ ਕੈਰੀਅਰ, 4G, 3G, 2G, LTE"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"ਹਵਾਈ-ਜਹਾਜ਼ ਸੁਰੱਖਿਅਤ ਨੈੱਟਵਰਕ ਦੇਖੋ"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"ਹਵਾਈ-ਜਹਾਜ਼ ਮੋਡ ਬੰਦ ਕਰੋ"</string>
+    <!-- no translation found for view_airplane_safe_networks (9170023210981508906) -->
+    <skip />
+    <!-- no translation found for turn_off_airplane_mode (7141986366534514443) -->
+    <skip />
+    <!-- no translation found for preference_summary_default_combination (4643585915107796253) -->
+    <skip />
+    <!-- no translation found for mobile_data_connection_active (2422223108911581552) -->
+    <skip />
+    <!-- no translation found for mobile_data_off_summary (3841411571485837651) -->
+    <skip />
+    <!-- no translation found for non_carrier_network_unavailable (9031567407964127997) -->
+    <skip />
+    <!-- no translation found for all_network_unavailable (1163897808282057496) -->
+    <skip />
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"ਬੈੱਡਟਾਈਮ ਮੋਡ ਚਾਲੂ ਹੋਣ ਕਰਕੇ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"ਸੂਚਨਾ ਦੀ ਮਹੱਤਤਾ ਨੂੰ ਪੂਰੀ ਤਰ੍ਹਾਂ ਰੀਸੈੱਟ ਕਰੋ।"</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"ਐਪਾਂ"</string>
-    <!-- no translation found for bluetooth_message_access_notification_content (2986108412562309009) -->
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"ਗੈਰ-ਭਰੋਸੇਯੋਗ ਡੀਵਾਈਸ ਤੁਹਾਡੇ ਸੁਨੇਹਿਆਂ ਤੱਕ ਪਹੁੰਚ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ। ਵੇਰਵਿਆਂ ਲਈ ਟੈਪ ਕਰੋ।"</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"ਕੀ ਸੁਨੇਹਿਆਂ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੇਣੀ ਹੈ?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"ਕੋਈ ਗੈਰ-ਭਰੋਸੇਯੋਗ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸ, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, ਤੁਹਾਡੇ ਸੁਨੇਹਿਆਂ ਤੱਕ ਪਹੁੰਚ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ।\n\nਤੁਸੀਂ ਪਹਿਲਾਂ ਕਦੇ ਵੀ <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਹੈ।"</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"ਗੈਰ-ਭਰੋਸੇਯੋਗ ਡੀਵਾਈਸ ਤੁਹਾਡੇ ਸੰਪਰਕਾਂ ਅਤੇ ਕਾਲ ਲੌਗ ਤੱਕ ਪਹੁੰਚ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ। ਵੇਰਵਿਆਂ ਲਈ ਟੈਪ ਕਰੋ।"</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"ਕੀ ਸੰਪਰਕਾਂ ਅਤੇ ਕਾਲ ਲੌਗ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੇਣੀ ਹੈ?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"ਕੋਈ ਗੈਰ-ਭਰੋਸੇਯੋਗ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸ, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, ਤੁਹਾਡੇ ਸੰਪਰਕਾਂ ਅਤੇ ਕਾਲ ਲੌਗ ਤੱਕ ਪਹੁੰਚ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ। ਇਸ ਵਿੱਚ ਇਨਕਮਿੰਗ ਅਤੇ ਆਊਟਗੋਇੰਗ ਕਾਲਾਂ ਬਾਰੇ ਡਾਟਾ ਸ਼ਾਮਲ ਹੈ।\n\nਤੁਸੀਂ ਪਹਿਲਾਂ ਕਦੇ ਵੀ <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਹੈ।"</string>
+    <!-- no translation found for category_name_brightness (8520372392029305084) -->
     <skip />
-    <!-- no translation found for bluetooth_message_access_dialog_title (9009836130395061579) -->
+    <!-- no translation found for category_name_lock_display (7478785189102882266) -->
     <skip />
-    <!-- no translation found for bluetooth_message_access_dialog_content (6004506637437582983) -->
+    <!-- no translation found for category_name_visibility (4485030512199246405) -->
     <skip />
-    <!-- no translation found for bluetooth_phonebook_access_notification_content (4280361621526852063) -->
+    <!-- no translation found for category_name_color (937514550918977151) -->
     <skip />
-    <!-- no translation found for bluetooth_phonebook_access_dialog_title (7624607995928968721) -->
+    <!-- no translation found for category_name_others (2366006298768550310) -->
     <skip />
-    <!-- no translation found for bluetooth_phonebook_access_dialog_content (2235876209172857819) -->
+    <!-- no translation found for category_name_general (7737273712848115886) -->
     <skip />
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index e63bb6d..cb147c2 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1269,11 +1269,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Godzina zakończenia"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Stan"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intensywność"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Wył. / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Nigdy nie włączy się automatycznie"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Włączy się automatycznie o <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Włączy się automatycznie o zachodzie słońca"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Włączone / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Nigdy nie wyłączy się automatycznie"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Wyłączy się automatycznie o <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Wyłączy się automatycznie o wschodzie słońca"</string>
@@ -1296,17 +1294,15 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Działa od zachodu do wschodu słońca"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Włącza się o wybranej godzinie"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Stan"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Wyłączony / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Nigdy nie włączy się automatycznie"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Włączy się automatycznie o zachodzie słońca"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Włączy się automatycznie o <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Włączony / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Nigdy nie wyłączy się automatycznie"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Wyłączy się automatycznie o wschodzie słońca"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Wyłączy się automatycznie o <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_activation_on_custom" msgid="1889379402860316125">"Włącz do <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_activation_off_custom" msgid="2192932161592759607">"Wyłącz do <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_text" msgid="4392646155331126666">"W trybie ciemnym czarne tło na niektórych ekranach pomaga wydłużyć czas pracy baterii. Harmonogramy trybu ciemnego są uruchamiane dopiero po wyłączeniu ekranu."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"Ciemny motyw używa czarnego tła, by na niektórych ekranach wydłużyć czas pracy baterii. Harmonogramy ciemnego motywu są uruchamiane dopiero po wyłączeniu ekranu."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Wygaszanie ekranu"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Wyłączenie ekranu"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> bezczynności"</string>
@@ -2184,6 +2180,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Czytniki ekranu"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Dźwięk i tekst na ekranie"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Wyświetlacz"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Zarządzanie interakcjami"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Pobrane aplikacje"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Eksperymentalne"</string>
@@ -2273,7 +2271,7 @@
     <string name="accessibility_long_press_timeout_preference_title" msgid="5237764682976688855">"Czas dotknięcia i przytrzymania"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="5476133104746207952">"Odwrócenie kolorów"</string>
     <string name="accessibility_display_inversion_switch_title" msgid="7458595722552743503">"Odwróć kolory"</string>
-    <string name="accessibility_display_inversion_preference_subtitle" msgid="6955835010409034745">"Odwrócenie kolorów zmienia jasne ekrany w ciemne.&lt;br/&gt;&lt;br/&gt; Uwaga: &lt;ol&gt; &lt;li&gt; Odwrócenie kolorów zmienia także ciemne ekrany w jasne.&lt;/li&gt; &lt;li&gt; Zmienią się kolory w multimediach i na obrazach.&lt;/li&gt; &lt;li&gt; Ciemne tło można też wyświetlać w trybie ciemnym. Tryb ciemny działa w obsługiwanych aplikacjach. Odwrócenie kolorów działa we wszystkich aplikacjach.&lt;/li&gt; &lt;/ol&gt;"</string>
+    <string name="accessibility_display_inversion_preference_subtitle" msgid="6955835010409034745">"Odwrócenie kolorów zmienia jasne ekrany w ciemne.&lt;br/&gt;&lt;br/&gt; Uwaga: &lt;ol&gt; &lt;li&gt; Odwrócenie kolorów zmienia także ciemne ekrany w jasne.&lt;/li&gt; &lt;li&gt; Zmienią się kolory w multimediach i na obrazach.&lt;/li&gt; &lt;li&gt; Ciemne tło można też wyświetlać w ciemnym motywie. Ciemny motyw działa w obsługiwanych aplikacjach. Odwrócenie kolorów działa we wszystkich aplikacjach.&lt;/li&gt; &lt;/ol&gt;"</string>
     <string name="accessibility_autoclick_preference_title" msgid="2703143361605555752">"Automatyczne kliknięcie (czas oczekiwania)"</string>
     <string name="accessibility_autoclick_description" msgid="6827042379062255307">"Automatyczne kliknięcie działa po podłączeniu myszy. Możesz ustawić jego wyzwalanie po zatrzymaniu przesuwającego się kursora na określony czas."</string>
     <string name="accessibility_autoclick_default_title" msgid="752429113115293087">"Wyłączone"</string>
@@ -2518,7 +2516,7 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Tablet używany intensywniej niż zwykle"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Urządzenie używane intensywniej niż zwykle"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Bateria może wyczerpać się szybciej niż zwykle"</string>
-    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optymalizuję, by utrzymać baterię w dobrym stanie"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optymalizuję, aby utrzymać baterię w dobrym stanie"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Bateria tymczasowo ograniczona. Kliknij, by dowiedzieć się więcej."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Telefon był używany intensywniej niż zwykle. Bateria może rozładować się szybciej.\n\nAplikacje najbardziej wyczerpujące baterię:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Tablet był używany intensywniej niż zwykle. Bateria może rozładować się szybciej.\n\nAplikacje najbardziej wyczerpujące baterię:"</string>
@@ -3161,10 +3159,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Usuń użytkownika"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Usuń"</string>
     <string name="user_guest" msgid="4545590092001460388">"Gość"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Usuń gościa"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Usunąć gościa?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Wyczyść dane gościa"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Kończenie sesji gościa"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Zakończyć sesję gościa?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Wszystkie aplikacje i dane w tej sesji zostaną usunięte."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Usuń"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Zakończ sesję"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Włącz rozmowy telefoniczne"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Włącz rozmowy telefoniczne i SMS-y"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Usuń użytkownika"</string>
@@ -3389,7 +3388,7 @@
     <string name="keywords_model_and_hardware" msgid="4723665865709965044">"numer seryjny, wersja sprzętu"</string>
     <string name="keywords_android_version" msgid="1629882125290323070">"stan aktualizacji zabezpieczeń Androida, wersja pasma podstawowego, wersja jądra"</string>
     <string name="keywords_dark_ui_mode" msgid="6465231409128452489">"motyw, jasny, ciemny, tryb"</string>
-    <string name="keywords_systemui_theme" msgid="6341194275296707801">"tryb ciemny"</string>
+    <string name="keywords_systemui_theme" msgid="6341194275296707801">"ciemny motyw"</string>
     <string name="keywords_device_feedback" msgid="5489930491636300027">"błąd"</string>
     <string name="keywords_ambient_display_screen" msgid="661492302323274647">"Wygaszacz z powiadomieniami, ekran blokady"</string>
     <string name="keywords_lock_screen_notif" msgid="6363144436467429932">"powiadomienia na ekranie blokady, powiadomienia"</string>
@@ -3681,7 +3680,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Rozmowy inne niż priorytetowe"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Rozmowy z Twoimi zmianami"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Ostatnie rozmowy"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Wyczyść ostatnie"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Wyczyść ostatnie"</string>
     <string name="clear" msgid="5092178335409471100">"Wyczyść"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Wyświetlaj rozmowy priorytetowe w dymkach"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Rozmowy priorytetowe są wyświetlane u góry obszaru powiadomień. Możesz też skonfigurować je tak, by wyświetlały się jako dymki i przerywały działanie trybu Nie przeszkadzać."</string>
@@ -4563,12 +4562,13 @@
     <string name="bluetooth_connected_summary" msgid="8043167194934315712">"Połączono z: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Połączono z wieloma urządzeniami"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Tryb demonstracyjny interfejsu"</string>
-    <string name="dark_ui_mode" msgid="898146394425795281">"Tryb ciemny"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Wł. / Czasowo wyłączony z powodu oszczędzania baterii"</string>
+    <string name="dark_ui_mode" msgid="898146394425795281">"Ciemny motyw"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Czasowo włączony z powodu oszczędzania baterii"</string>
-    <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Obsługiwane aplikacje również zostaną przełączone w tryb ciemny"</string>
+    <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Obsługiwane aplikacje również zostaną przełączone w ciemnym motywie"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"OK"</string>
-    <string name="dark_theme_slice_title" msgid="4684222119481114062">"Wypróbuj tryb ciemny"</string>
+    <string name="dark_theme_slice_title" msgid="4684222119481114062">"Wypróbuj ciemny motyw"</string>
     <string name="dark_theme_slice_subtitle" msgid="5555724345330434268">"Wydłuża czas pracy baterii"</string>
     <string name="quick_settings_developer_tiles" msgid="7336007844525766623">"Kafelki szybkich ustawień dla programisty"</string>
     <string name="adb_authorization_timeout_title" msgid="6996844506783749754">"Wyłącz czas oczekiwania autoryzacji adb"</string>
@@ -5229,15 +5229,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Ustawienia"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Łącz się z sieciami publicznymi"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"połączenie sieciowe, internet, bezprzewodowy, dane, Wi-Fi, wi-fi, wi fi, komórka, telefon, operator komórkowy, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Wyświetl sieci dostępne w trybie samolotowym"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Wyłącz tryb samolotowy"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Wyświetl sieci dostępne w trybie samolotowym"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Wyłącz tryb samolotowy"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Połączono"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Nie połączy z internetem automatycznie"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Brak innych dostępnych sieci"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Brak dostępnych sieci"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Niedostępne, ponieważ włączony jest tryb snu"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Ukończono resetowanie ważności powiadomień."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Aplikacje"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Niezaufane urządzenie chce uzyskać dostęp do Twoich wiadomości. Kliknij, by wyświetlić szczegóły."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Zezwolić na dostęp do wiadomości?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Niezaufane urządzenie Bluetooth, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], chce uzyskać dostęp do Twoich wiadomości.\n\nTwoje urządzenie nie łączyło się wcześniej z urządzeniem [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Niezaufane urządzenie Bluetooth (<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>) chce uzyskać dostęp do Twoich wiadomości.\n\nTwoje urządzenie nie łączyło się wcześniej z urządzeniem <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Niezaufane urządzenie chce uzyskać dostęp do Twoich kontaktów i rejestru połączeń. Kliknij, by wyświetlić szczegóły."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Zezwolić na dostęp do kontaktów i rejestru połączeń?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Niezaufane urządzenie Bluetooth, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], chce uzyskać dostęp do Twoich kontaktów i rejestru połączeń. Chodzi między innymi o dane o połączeniach przychodzących i wychodzących.\n\nTwoje urządzenie nie łączyło się wcześniej z urządzeniem [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Niezaufane urządzenie Bluetooth (<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>) chce uzyskać dostęp do Twoich kontaktów i rejestru połączeń. Chodzi między innymi o dane o połączeniach przychodzących i wychodzących.\n\nTwoje urządzenie nie łączyło się wcześniej z urządzeniem <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Jasność"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Blokowanie wyświetlacza"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Widoczność"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Kolor"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Inne"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 0721848..27fe36f 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Horário de término"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Status"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intensidade"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Desativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Nunca será ativado automaticamente"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Será ativada automaticamente às <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Será ativada automaticamente ao anoitecer"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Ativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Nunca será desativado automaticamente"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Será desativado automaticamente às <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Será desativado automaticamente ao amanhecer"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Ativ. do anoitecer ao amanhecer"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Ativado nos horários definidos"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Status"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Desativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Nunca será ativado automaticamente"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Será ativada automaticamente ao anoitecer"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Será ativado automaticamente: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Ativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Nunca será desativado automaticamente"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Será desativado automaticamente ao amanhecer"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Será desativado automaticamente: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Leitores de tela"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Áudio e texto na tela"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Tela"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Controles de interação"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Apps transferidos por download"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Experimentais"</string>
@@ -3075,10 +3073,15 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Excluir usuário"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Excluir"</string>
     <string name="user_guest" msgid="4545590092001460388">"Convidado"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Remover convidado"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Remover convidado?"</string>
+    <!-- no translation found for user_clear_guest_menu (4864362688187480452) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_menu (5064400453222497734) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_confirm_title (7526978959527761497) -->
+    <skip />
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Todos os apps e dados nesta sessão serão excluídos."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Remover"</string>
+    <!-- no translation found for user_exit_guest_dialog_remove (8095094235815676847) -->
+    <skip />
     <string name="user_enable_calling" msgid="264875360626905535">"Ativar chamadas telefônicas"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Ativar chamadas telefônicas e SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Excluir usuário"</string>
@@ -3591,7 +3594,8 @@
     <string name="other_conversations" msgid="551178916855139870">"Conversas sem prioridade"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Conversas que você modificou"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Conversas recentes"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Limpar recentes"</string>
+    <!-- no translation found for conversation_settings_clear_recents (4246342656145488662) -->
+    <skip />
     <string name="clear" msgid="5092178335409471100">"Limpar"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Mostrar conversas prioritárias em balões"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Conversas prioritárias são mostradas na parte superior da aba suspensa. Você também pode configurá-las para que sejam mostradas em balões e interrompam o modo \"Não perturbe\"."</string>
@@ -4424,7 +4428,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Conectado a vários dispositivos"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Modo de demonstração da IU do sistema"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Tema escuro"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Ativado / Temporariamente desativado devido à Economia de bateria"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Temporariamente ativado devido à Economia de bateria"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Os apps compatíveis também mudarão para o tema escuro"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Ok"</string>
@@ -5063,15 +5068,34 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferências"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Conectar-se a redes públicas"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"conexão de rede, internet, sem fio, dados, wifi, wi-fi, wi fi, celular, rede móvel, operadora de celular, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Ver redes seguras para aviões"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Desativar o modo avião"</string>
+    <!-- no translation found for view_airplane_safe_networks (9170023210981508906) -->
+    <skip />
+    <!-- no translation found for turn_off_airplane_mode (7141986366534514443) -->
+    <skip />
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Conectado"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"A Internet não será automaticamente conectada"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Nenhuma outra rede disponível"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Nenhuma rede disponível"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Indisponível durante o Modo noite"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Redefinição da importância de notificações concluída."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Apps"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Um dispositivo não confiável quer acessar suas mensagens. Toque para ver detalhes."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Conceder acesso às mensagens?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Um dispositivo Bluetooth não confiável, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], quer acessar suas mensagens.\n\nVocê não se conectou a [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] antes."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Um dispositivo Bluetooth não confiável, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, quer acessar suas mensagens.\n\nVocê não se conectou ao <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> antes."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Um dispositivo não confiável quer acessar seus contatos e seu registro de chamadas. Toque para ver detalhes."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Conceder acesso aos contatos e ao registro de chamadas?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Um dispositivo Bluetooth não confiável, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], quer acessar seus contatos e seu registro de chamadas. Isso inclui dados sobre chamadas recebidas e realizadas.\n\nVocê não se conectou a [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] antes."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Um dispositivo Bluetooth não confiável, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, quer acessar seus contatos e seu registro de chamadas. Isso inclui dados sobre chamadas recebidas e realizadas.\n\nVocê não se conectou a <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> antes."</string>
+    <!-- no translation found for category_name_brightness (8520372392029305084) -->
+    <skip />
+    <!-- no translation found for category_name_lock_display (7478785189102882266) -->
+    <skip />
+    <!-- no translation found for category_name_visibility (4485030512199246405) -->
+    <skip />
+    <!-- no translation found for category_name_color (937514550918977151) -->
+    <skip />
+    <!-- no translation found for category_name_others (2366006298768550310) -->
+    <skip />
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index f79fc43..947fb69 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Hora de fim"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Estado"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intensidade"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Desativada/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Nunca se ativa automaticamente"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Ativa-se automaticamente à(s) <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Ativa-se automaticamente ao pôr do sol"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Ativada/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Nunca se desativa automaticamente"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Desativa-se automaticamente à(s) <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Desativa-se automaticamente ao nascer do sol"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Ativado do pôr ao nascer do sol"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"É ativado à hora personalizada"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Estado"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Desativado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Nunca se ativa automaticamente"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Ativa-se automaticamente ao pôr do sol"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Ativa-se automaticamente à(s) <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Ativado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Nunca se desativa automaticamente"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Desativa-se automaticamente ao nascer do sol"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Desativa-se automaticamente à(s) <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Leitores de ecrã"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Áudio e texto no ecrã"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Visualização"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Controlos de interação"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Apps transferidas"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Experimental"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Eliminar utilizador"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Eliminar"</string>
     <string name="user_guest" msgid="4545590092001460388">"Convidado"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Remover convidado"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Remover o convidado?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Limpar os dados de convidado"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Terminar a sessão de convidado"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Pretende terminar a sessão de convidado?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Todas as aplicações e dados desta sessão serão eliminados."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Remover"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Terminar sessão"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Ativar chamadas telefónicas"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Ativar chamadas telefónicas e SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Eliminar utilizador"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Conversas não prioritárias"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Conversas às quais efetuou alterações."</string>
     <string name="recent_conversations" msgid="471678228756995274">"Conversas recentes"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Limpar recentes"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Limpar recentes"</string>
     <string name="clear" msgid="5092178335409471100">"Limpar"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Apresentar conversas com prioridade como balão"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"As conversas com prioridade são apresentadas na parte superior do painel pendente. Também pode defini-las como balões e para interromperem o modo Não incomodar."</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Ligado a vários dispositivos"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Modo de demonstração da IU do sistema"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Tema escuro"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Ativado/Temporariamente desativado devido à Poupança de bateria"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Temporariamente ativado devido à Poupança de bateria"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"As aplicações suportadas também mudam para o tema escuro"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"OK"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferências"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Ligar a redes públicas"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ligação de rede, internet, sem fios, dados, wifi, wi-fi, wi fi, telemóvel, dispositivo móvel, operador de telemóvel, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Ver as redes seguras para aviões"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Desativar o modo de avião"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Ver redes do modo de avião"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Desativar o modo de avião"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Ligado"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"A Internet não estabelece ligação automaticamente"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Nenhuma outra rede disponível"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Sem redes disponíveis"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Não disponível porque o modo de hora de dormir está ativado."</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Reposição da importância das notificações concluída."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Apps"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Um dispositivo não fidedigno pretende aceder às suas mensagens. Toque para obter detalhes."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Pretende permitir o acesso às mensagens?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Um dispositivo Bluetooth não fidedigno, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], pretende aceder às suas mensagens.\n\nNão estabeleceu ligação ao dispositivo [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] anteriormente."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Um dispositivo Bluetooth não fidedigno, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, pretende aceder às suas mensagens.\n\nNão estabeleceu ligação ao dispositivo <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> anteriormente."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Um dispositivo não fidedigno pretende aceder aos seus contactos e registo de chamadas. Toque para obter detalhes."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Pretende permitir o acesso aos contactos e registo de chamadas?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Um dispositivo Bluetooth não fidedigno, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], pretende aceder aos seus contactos e registo de chamadas. Isto inclui dados acerca de chamadas recebidas e efetuadas.\n\nNão estabeleceu ligação ao dispositivo [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] anteriormente."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Um dispositivo Bluetooth não fidedigno, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, pretende aceder aos seus contactos e registo de chamadas. Isto inclui dados acerca de chamadas recebidas e efetuadas.\n\nNão estabeleceu ligação ao dispositivo <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> anteriormente."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Brilho"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Ecrã de bloqueio"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Visibilidade"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Cor"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Outros"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 0721848..27fe36f 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Horário de término"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Status"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intensidade"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Desativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Nunca será ativado automaticamente"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Será ativada automaticamente às <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Será ativada automaticamente ao anoitecer"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Ativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Nunca será desativado automaticamente"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Será desativado automaticamente às <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Será desativado automaticamente ao amanhecer"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Ativ. do anoitecer ao amanhecer"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Ativado nos horários definidos"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Status"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Desativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Nunca será ativado automaticamente"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Será ativada automaticamente ao anoitecer"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Será ativado automaticamente: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Ativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Nunca será desativado automaticamente"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Será desativado automaticamente ao amanhecer"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Será desativado automaticamente: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Leitores de tela"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Áudio e texto na tela"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Tela"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Controles de interação"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Apps transferidos por download"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Experimentais"</string>
@@ -3075,10 +3073,15 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Excluir usuário"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Excluir"</string>
     <string name="user_guest" msgid="4545590092001460388">"Convidado"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Remover convidado"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Remover convidado?"</string>
+    <!-- no translation found for user_clear_guest_menu (4864362688187480452) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_menu (5064400453222497734) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_confirm_title (7526978959527761497) -->
+    <skip />
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Todos os apps e dados nesta sessão serão excluídos."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Remover"</string>
+    <!-- no translation found for user_exit_guest_dialog_remove (8095094235815676847) -->
+    <skip />
     <string name="user_enable_calling" msgid="264875360626905535">"Ativar chamadas telefônicas"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Ativar chamadas telefônicas e SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Excluir usuário"</string>
@@ -3591,7 +3594,8 @@
     <string name="other_conversations" msgid="551178916855139870">"Conversas sem prioridade"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Conversas que você modificou"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Conversas recentes"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Limpar recentes"</string>
+    <!-- no translation found for conversation_settings_clear_recents (4246342656145488662) -->
+    <skip />
     <string name="clear" msgid="5092178335409471100">"Limpar"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Mostrar conversas prioritárias em balões"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Conversas prioritárias são mostradas na parte superior da aba suspensa. Você também pode configurá-las para que sejam mostradas em balões e interrompam o modo \"Não perturbe\"."</string>
@@ -4424,7 +4428,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Conectado a vários dispositivos"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Modo de demonstração da IU do sistema"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Tema escuro"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Ativado / Temporariamente desativado devido à Economia de bateria"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Temporariamente ativado devido à Economia de bateria"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Os apps compatíveis também mudarão para o tema escuro"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Ok"</string>
@@ -5063,15 +5068,34 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferências"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Conectar-se a redes públicas"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"conexão de rede, internet, sem fio, dados, wifi, wi-fi, wi fi, celular, rede móvel, operadora de celular, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Ver redes seguras para aviões"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Desativar o modo avião"</string>
+    <!-- no translation found for view_airplane_safe_networks (9170023210981508906) -->
+    <skip />
+    <!-- no translation found for turn_off_airplane_mode (7141986366534514443) -->
+    <skip />
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Conectado"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"A Internet não será automaticamente conectada"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Nenhuma outra rede disponível"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Nenhuma rede disponível"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Indisponível durante o Modo noite"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Redefinição da importância de notificações concluída."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Apps"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Um dispositivo não confiável quer acessar suas mensagens. Toque para ver detalhes."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Conceder acesso às mensagens?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Um dispositivo Bluetooth não confiável, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], quer acessar suas mensagens.\n\nVocê não se conectou a [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] antes."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Um dispositivo Bluetooth não confiável, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, quer acessar suas mensagens.\n\nVocê não se conectou ao <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> antes."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Um dispositivo não confiável quer acessar seus contatos e seu registro de chamadas. Toque para ver detalhes."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Conceder acesso aos contatos e ao registro de chamadas?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Um dispositivo Bluetooth não confiável, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], quer acessar seus contatos e seu registro de chamadas. Isso inclui dados sobre chamadas recebidas e realizadas.\n\nVocê não se conectou a [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] antes."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Um dispositivo Bluetooth não confiável, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, quer acessar seus contatos e seu registro de chamadas. Isso inclui dados sobre chamadas recebidas e realizadas.\n\nVocê não se conectou a <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> antes."</string>
+    <!-- no translation found for category_name_brightness (8520372392029305084) -->
+    <skip />
+    <!-- no translation found for category_name_lock_display (7478785189102882266) -->
+    <skip />
+    <!-- no translation found for category_name_visibility (4485030512199246405) -->
+    <skip />
+    <!-- no translation found for category_name_color (937514550918977151) -->
+    <skip />
+    <!-- no translation found for category_name_others (2366006298768550310) -->
+    <skip />
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 82e6e7c..4254a89 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -1249,11 +1249,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Ora încheierii"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Stare"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intensitate"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Dezactivat/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Nu se va activa niciodată automat"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Se va activa automat la <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Se va activa automat la apus"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Activat/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Nu se va dezactiva niciodată automat"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Se va dezactiva automat la <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Se va dezactiva automat la răsărit"</string>
@@ -1276,11 +1274,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Se activează de la apus la răsărit"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Se activează la o anumită oră"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Stare"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Dezactivată/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Nu se va activa niciodată automat"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Se va activa automat la apus"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Se va activa automat la <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Activată/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Nu se va dezactiva niciodată automat"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Se va dezactiva automat la răsărit"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Se va dezactiva automat la <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2160,6 +2156,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Cititoare de ecran"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio și text pe ecran"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Afișaj"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Comenzi pentru interacțiune"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Aplicații descărcate"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Experimentale"</string>
@@ -3118,10 +3116,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Ștergeți utilizatorul"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Ștergeți"</string>
     <string name="user_guest" msgid="4545590092001460388">"Invitat"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Ștergeți invitatul"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Ștergeți invitatul?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Eliminați datele despre invitați"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Încheiați sesiunea pentru invitați"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Încheiați sesiunea pentru invitați?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Toate aplicațiile și datele din această sesiune vor fi șterse."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Ștergeți"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Încheiați sesiunea"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Activați apelurile telefonice"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Activați apelurile telefonice și SMS-urile"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Ștergeți utilizatorul"</string>
@@ -3636,7 +3635,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Conversații fără prioritate"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Conversații pe care le-ați modificat"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Conversații recente"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Ștergeți conversațiile recente"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Eliminați-le pe cele recente"</string>
     <string name="clear" msgid="5092178335409471100">"Ștergeți"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Afișează în balon conversațiile cu prioritate"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Conversațiile cu prioritate apar în partea de sus a panoului de notificări tras în jos. Le puteți seta să se afișeze în baloane și să întrerupă funcția Nu deranja."</string>
@@ -4494,7 +4493,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Conectat la mai multe dispozitive"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Mod demonstrativ pentru IU sistem"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Temă întunecată"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Pornit / dezactivat temporar de Economisirea bateriei"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Pornit temporar de Economisirea bateriei"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Și aplicațiile acceptate vor comuta la tema întunecată"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Am înțeles"</string>
@@ -5146,15 +5146,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferințe"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Conectați-vă la rețele publice"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"conexiune la rețea, internet, wireless, date, wifi, wi-fi, wi fi, celular, mobil, operator servicii mobile, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Vedeți rețelele sigure pentru avioane"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Dezactivați modul Avion"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Vedeți rețelele sigure pentru avioane"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Dezactivați modul Avion"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Conectat"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Nu se conectează automat la internet"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Nu sunt disponibile alte rețele"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Nicio rețea disponibilă"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Indisponibil deoarece modul ora de culcare este activat"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"S-a finalizat resetarea importanței notificărilor."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Aplicații"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Un dispozitiv care nu prezintă încredere solicită acces la mesajele dvs. Atingeți pentru detalii."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Permiteți accesul la mesaje?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Un dispozitiv Bluetooth care nu prezintă încredere, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], solicită acces la mesajele dvs.\n\nNu v-ați mai conectat la [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Un dispozitiv Bluetooth care nu prezintă încredere, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, solicită acces la mesajele dvs.\n\nNu v-ați mai conectat la <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Un dispozitiv care nu prezintă încredere solicită acces la agenda și jurnalul dvs. de apeluri. Atingeți pentru detalii."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Permiteți accesul la agendă și la jurnalul de apeluri?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Un dispozitiv Bluetooth care nu prezintă încredere, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], solicită acces la agenda și jurnalul dvs. de apeluri. Aici sunt incluse date despre apelurile primite și efectuate.\n\nNu v-ați mai conectat la [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Un dispozitiv Bluetooth care nu prezintă încredere, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, solicită acces la agenda și jurnalul dvs. de apeluri. Aici sunt incluse date despre apelurile primite și efectuate.\n\nNu v-ați mai conectat la <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Luminozitate"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Ecran de blocare"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Vizibilitate"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Culoare"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Altele"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 7259f55..c3df514 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1269,11 +1269,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Время отключения"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Статус"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Интенсивность"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Отключено/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Не включится автоматически"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Включится автоматически в <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Включится автоматически на закате"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Включен/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Не выключится автоматически"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Выключится автоматически в <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Выключится автоматически на рассвете"</string>
@@ -1296,11 +1294,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"От заката до рассвета"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"В выбранное время"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Статус"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Отключено/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Не включится автоматически"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Включится автоматически на закате"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Включится автоматически в <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Включено/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Не выключится автоматически"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Выключится автоматически на рассвете"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Отключится автоматически в <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2184,6 +2180,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Программы чтения с экрана"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Аудио и озвучивание текста"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Экран"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Элементы управления"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Скачанные приложения"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Экспериментальные функции"</string>
@@ -3161,10 +3159,15 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Удалить пользователя"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Удалить"</string>
     <string name="user_guest" msgid="4545590092001460388">"Гость"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Удалить аккаунт гостя"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Удалить аккаунт гостя?"</string>
+    <!-- no translation found for user_clear_guest_menu (4864362688187480452) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_menu (5064400453222497734) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_confirm_title (7526978959527761497) -->
+    <skip />
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Все приложения и данные этого профиля будут удалены."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Удалить"</string>
+    <!-- no translation found for user_exit_guest_dialog_remove (8095094235815676847) -->
+    <skip />
     <string name="user_enable_calling" msgid="264875360626905535">"Включить звонки"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Включить звонки и SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Удалить пользователя"</string>
@@ -3681,7 +3684,8 @@
     <string name="other_conversations" msgid="551178916855139870">"Неприоритетные разговоры"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Разговоры, в которые вы вносили изменения:"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Недавние разговоры"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Удалить недавние"</string>
+    <!-- no translation found for conversation_settings_clear_recents (4246342656145488662) -->
+    <skip />
     <string name="clear" msgid="5092178335409471100">"Очистить"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Показывать всплывающие чаты для важных разговоров"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Важные разговоры появляются в верхней части панели уведомлений. Для них можно включить всплывающие чаты, а также разрешить показ сообщений в режиме \"Не беспокоить\"."</string>
@@ -4564,7 +4568,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Подключено к нескольким устройствам"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Интерфейс системы: деморежим"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Тёмная тема"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Включена (временно отключено из-за режима энергосбережения)"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Временно включена из-за режима энергосбережения"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Приложения, которые поддерживают эту функцию, также переключатся на тёмную тему."</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"ОК"</string>
@@ -5229,15 +5234,34 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Настройки"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Подключаться к общедоступным сетям"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"сетевое подключение, Интернет, беспроводная сеть, передача данных, Wi-Fi, wifi, wi fi, сотовая сеть, мобильный Интернет, сотовый оператор, 4G, 3G, 2G, LTE"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Показать сети, безопасные в самолете"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Отключить режим полета"</string>
+    <!-- no translation found for view_airplane_safe_networks (9170023210981508906) -->
+    <skip />
+    <!-- no translation found for turn_off_airplane_mode (7141986366534514443) -->
+    <skip />
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Подключено"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Не удается автоматически подключиться к Интернету"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Нет других доступных сетей"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Нет доступных сетей"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Недоступно в ночном режиме"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Сброс настроек важности выполнен."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Приложения"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Неизвестное устройство запрашивает доступ к вашим сообщениям. Нажмите, чтобы узнать больше."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Предоставить доступ к сообщениям?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Неизвестное устройство Bluetooth ([<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]) запрашивает доступ к вашим сообщениям.\n\nЭто ваше первое подключение к устройству [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Неизвестное устройство Bluetooth (<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>) запрашивает доступ к вашим сообщениям.\n\nЭто ваше первое подключение к устройству \"<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>\"."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Неизвестное устройство запрашивает доступ к вашим контактам и списку вызовов. Нажмите, чтобы узнать больше."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Предоставить доступ к контактам и списку вызовов?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Неизвестное устройство Bluetooth ([<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]) запрашивает доступ к вашим контактам и списку вызовов, включая данные о входящих и исходящих звонках.\n\nЭто ваше первое подключение к устройству [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Неизвестное устройство Bluetooth (<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>) запрашивает доступ к вашим контактам и списку вызовов, включая данные о входящих и исходящих звонках.\n\nЭто ваше первое подключение к устройству \"<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>\"."</string>
+    <!-- no translation found for category_name_brightness (8520372392029305084) -->
+    <skip />
+    <!-- no translation found for category_name_lock_display (7478785189102882266) -->
+    <skip />
+    <!-- no translation found for category_name_visibility (4485030512199246405) -->
+    <skip />
+    <!-- no translation found for category_name_color (937514550918977151) -->
+    <skip />
+    <!-- no translation found for category_name_others (2366006298768550310) -->
+    <skip />
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index d2d8b52..767d7fd 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"අවසන් වන වේලාව"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"තත්ත්වය"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"ත්‍රීවතාවය"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"ක්‍රියාවිරහිතයි / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"කිසි විටෙක ස්වයංක්‍රියව ක්‍රියාත්මක නොකරනු ඇත"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"<xliff:g id="ID_1">%1$s</xliff:g>ට ස්වයංක්‍රියව ක්‍රියාත්මක කරනු ඇත."</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"හිරු බැස යාමේදී ස්වයංක්‍රියව ක්‍රියාත්මක කරනු ඇත"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"ක්‍රියාත්මකයි / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"කිසි විටෙක ස්වයංක්‍රියව ක්‍රියාවිරහිත නොකරනු ඇත"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"<xliff:g id="ID_1">%1$s</xliff:g>ට ස්වයංක්‍රියව ක්‍රියාවිරහිත කරනු ඇත"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"හිරු නැගීමේදී ස්වයංක්‍රියව ක්‍රියාවිරහිත කරනු ඇත"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"හිරු බැසීම සිට නැගීම තෙක් ක්‍රි."</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"අභිරුචි වේලාවට ක්‍රියාත්මක වේ"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"තත්ත්වය"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"ක්‍රියාවිරහිතයි / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"කිසි විටෙක ස්වයංක්‍රියව ක්‍රියාත්මක නොකරනු ඇත"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"හිරු බැස යාමේදී ස්වයංක්‍රියව ක්‍රියාත්මක කරනු ඇත"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"<xliff:g id="ID_1">%1$s</xliff:g>ට ස්වයංක්‍රියව ක්‍රියාත්මක වනු ඇත"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"ක්‍රියාත්මකයි / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"කිසි විටෙක ස්වයංක්‍රියව ක්‍රියාවිරහිත නොකරනු ඇත"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"හිරු නැගීමේදී ස්වයංක්‍රියව ක්‍රියාවිරහිත කරනු ඇත"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"<xliff:g id="ID_1">%1$s</xliff:g>ට ස්වයංක්‍රියව ක්‍රියාවිරහිත වනු ඇත"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"තිර කියවන"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ශ්‍රව්‍ය සහ තිරය මත පෙළ"</string>
     <string name="display_category_title" msgid="6638191682294461408">"සංදර්ශකය"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"අන්තර්ක්‍රියා පාලන"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"බාගත් යෙදුම්"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"පරීක්ෂණාත්මක"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"පරිශීලකයා මකන්න"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"මකන්න"</string>
     <string name="user_guest" msgid="4545590092001460388">"අමුත්තා"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"අමුත්තා ඉවත් කරන්න"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"අමුත්තාන් ඉවත් කරන්නද?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"ආරාධිත දත්ත හිස් කරන්න"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"ආරාධිත සැසිය අවසන් කරන්න"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"ආරාධිත සැසිය අවසන් කරන්නද?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"මෙම සැසියේ සියළුම යෙදුම් සහ දත්ත මකාවී."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"ඉවත් කරන්න"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"සැසිය අවසන් කරන්න"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"දුරකථන ඇමතුම් ක්‍රියාත්මක කරන්න"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"දුරකථන ඇමතුම් සහ SMS ක්‍රියාත්මක කරන්න?"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"පරිශීලකයා මකන්න"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"ප්‍රමුඛතා නොවන සංවාද"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"ඔබ වෙනස් කිරීම් කර ඇති සංවාද"</string>
     <string name="recent_conversations" msgid="471678228756995274">"මෑත සංවාද"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"මෑත ඒවා හිස් කරන්න"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"මෑත සියල්ල හිස් කර."</string>
     <string name="clear" msgid="5092178335409471100">"හිස් කරන්න"</string>
     <string name="important_bubble" msgid="7911698275408390846">"ප්‍රමුඛතා සංවාද බුබුලු දමන්න"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"ප්‍රමුඛතා සංවාද පහළට-ඇදීමේ වැස්ම ඉහළින් පෙන්වයි. ඔබට ඒවා බුබුලු නැගීමට සැකසීමට සහ බාධා නොකරන්න බාධා කිරීමටද හැකිය."</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"උපාංග කිහිපයකට සම්බන්ධිතයි"</string>
     <string name="demo_mode" msgid="6566167465451386728">"පද්ධති UI ආදර්ශන ප්‍රකාරය"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"අඳුරු තේමාව"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"සක්‍රීය / බැටරි සුරැකුම හේතුවෙන් තාවකාලිකව අබල කළා"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"බැටරි සුරැකුම හේතුවෙන් තාවකාලිකව සක්‍රීය කළා"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"සහය දැක්වෙන යෙදුම් අඳුරු තේමාවට ද මාරු වෙති"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"තේරුණා"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"මනාප"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"පොදු ජාලයකට සම්බන්ධ වන්න"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ජාල සම්බන්ධතාව, අන්තර්ජාලය, රැහැන් රහිත, දත්ත, wifi, wi-fi, wi fi, සෙලියුලර්, ජංගම, සෙල් වාහක, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"ගුවන් යානා-ආරක්ෂිත ජාල බලන්න"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"ගුවන් යානා ප්‍රකාරය ක්‍රියාවිරහිත කරන්න"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"ගුවන් යානා ප්‍රකාර ජාල බලන්න"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"ගුවන් යානා ප්‍රකාරය ක්‍රියාවිරහිත කරන්න"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"සම්බන්ධයි"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"අන්තර්ජාලය ස්වයංක්‍රියව සබඳින්නේ නැත"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"ලබා ගත හැකි වෙනත් ජාල නැත"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"ජාලය නොතිබේ"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"නිද්‍රා කාල ප්‍රකාරය ක්‍රියාත්මක නිසා ලබා ගත නොහැකිය"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"දැනුම්දීම්වල වැදගත්කම යළි සැකසීම සම්පූර්ණ කරන ලදි."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"යෙදුම්"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"විශ්වාසදායී නොවන උපාංගයකට ඔබගේ පණිවිඩ වෙත ප්‍රවේශ විමට අවශ්‍යයි. විස්තර සඳහා තට්ටු කරන්න."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"පණිවිඩවලට ප්‍රවේශ වීමට ඉඩ දෙන්නද?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"විශ්වාසදායී නොවන බ්ලූටූත් උපාංගයකට, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ඔබගේ පණිවිඩවලට ප්‍රවේශ වීමට අවශ්‍යයි.\n\nඔබ මීට පෙර [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] වෙත සබැඳී නැත."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"විශ්වාසදායී නොවන බ්ලූටූත් උපාංගයකට, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, ඔබගේ පණිවිඩවලට ප්‍රවේශ වීමට අවශ්‍යයි.\n\nඔබ මීට පෙර <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> වෙත සම්බන්ධ වී නැත."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"විශ්වාසදායී නොවන බ්ලූටූත් උපාංගයකට, ඔබගේ සම්බන්ධතාවලට සහ ඇමතුම් ලොගයට ප්‍රවේශ වීමට අවශ්‍යයි. විස්තර සඳහා තට්ටු කරන්න."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"සම්බන්ධතා සහ ඇමතුම් ලොගය වෙත ප්‍රවේශය ඉඩ දෙන්නද?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"විශ්වාසදායී නොවන බ්ලූටූත් උපාංගයකට, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ඔබගේ සම්බන්ධතාවලට සහ ඇමතුම් ලොගයට ප්‍රවේශ වීමට අවශ්‍යයි. පැමිණෙන සහ පිටතට යන ඇමතුම් පිළිබඳ දත්ත මෙයට ඇතුළත් වේ.\n\nඔබ මීට පෙර [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] වෙත සබැඳී නැත."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"විශ්වාසදායී නොවන බ්ලූටූත් උපාංගයකට, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, ඔබගේ සම්බන්ධතාවලට සහ ඇමතුම් ලොගයට ප්‍රවේශ වීමට අවශ්‍යයි. පැමිණෙන සහ පිටතට යන ඇමතුම් පිළිබඳ දත්ත මෙයට ඇතුළත් වේ.\n\nඔබ මීට පෙර <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> වෙත සම්බන්ධ වී නැත."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"දීප්තිය"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"සංදර්ශකය අගුලු දමන්න"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"දෘශ්‍යතාව"</string>
+    <string name="category_name_color" msgid="937514550918977151">"වර්ණය"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"වෙනත්"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index e1b6ea5..0ff8592 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -1269,11 +1269,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Čas ukončenia"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Stav"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intenzita"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Vypnuté / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Nikdy sa automaticky nezapne"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Zapne sa automaticky o <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Zapne sa automaticky pri západe slnka"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Zapnuté / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Nikdy sa automaticky nevypne"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Vypne sa automaticky o <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Vypne sa automaticky pri východe slnka"</string>
@@ -1296,11 +1294,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Od západu do východu slnka"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Zapne sa vo vybranom čase"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Stav"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Vypnuté / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Nikdy sa automaticky nezapne"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Zapne sa automaticky pri západe slnka"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Zapne sa automaticky o <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Zapnuté / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Nikdy sa automaticky nevypne"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Vypne sa automaticky pri východe slnka"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Vypne sa automaticky o <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2184,6 +2180,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Čítačky obrazovky"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Zvuk a text na obrazovke"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Zobrazenie"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Doplnkové ovládanie"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Stiahnuté aplikácie"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Experimentálne"</string>
@@ -3161,10 +3159,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Odobrať používateľa"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Odstrániť"</string>
     <string name="user_guest" msgid="4545590092001460388">"Hosť"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Odstrániť hosťa"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Odstrániť hosťa?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Vymazať údaje hosťa"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Ukončiť reláciu hosťa"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Chcete ukončiť reláciu hosťa?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Všetky aplikácie a údaje v tejto relácii budú odstránené."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Odstrániť"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Ukončiť reláciu"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Zapnúť telefonické hovory"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Zapnúť telefonáty a SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Odobrať používateľa"</string>
@@ -3681,7 +3680,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Konverzácie bez priority"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Konverzácie, ktoré ste zmenili"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Nedávne konverzácie"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Vymazať nedávne"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Vymazať všetky nedávne"</string>
     <string name="clear" msgid="5092178335409471100">"Vymazať"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Zobrazovať prioritné konverzácie v bublinách"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Prioritné konverzácie sa zobrazujú v hornej časti panela upozornení. Môžete tiež nastaviť, aby sa zobrazovali v bubline a prerušili režim bez vyrušení."</string>
@@ -4564,7 +4563,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Pripojené k viacerým zariadeniam"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Ukážka používateľského rozhrania systému"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Tmavý motív"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Zapnuté / dočasne vypnuté šetričom batérie"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Dočasne zapnuté šetričom batérie"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Na tmavý motív sa prepnú aj podporované aplikácie"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Dobre"</string>
@@ -5229,15 +5229,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Predvoľby"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Pripájať k verejným sieťam"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"pripojenie k sieti, internet, bezdrôtové, dátové, wifi, wi-fi, wi fi, mobilné, mobilný operátor, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Zobraziť siete bezpečné v lietadle"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Vypnúť režim v lietadle"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Zobraziť siete režimu v lietadle"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Vypnúť režim v lietadle"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Pripojené"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet sa nepripojí automaticky"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Nie sú k dispozícii žiadne ďalšie siete"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Nie sú k dispozícii žiadne siete"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Nedostupné, pretože je zapnutý režim večierky"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Resetovanie dôležitosti upozornenia je dokončené."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Aplikácie"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Nedôveryhodné zariadenie vyžaduje prístup k vašim správam. Klepnutím zobrazíte podrobnosti."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Chcete povoliť prístup k správam?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Nedôveryhodné zariadenie s rozhraním Bluetooth [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] vyžaduje prístup k vašim správam.\n\nK zariadeniu [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ste sa predtým nikdy nepripojili."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Nedôveryhodné zariadenie <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> s rozhraním Bluetooth vyžaduje prístup k vašim správam.\n\nK zariadeniu <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> ste sa predtým nikdy nepripojili."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Nedôveryhodné zariadenie vyžaduje prístup k vašim kontaktom a zoznamu hovorov. Klepnutím zobrazíte podrobnosti."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Chcete povoliť prístup ku kontaktom a zoznamu hovorov?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Nedôveryhodné zariadenie s rozhraním Bluetooth [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] vyžaduje prístup k vašim kontaktom a zoznamu hovorov. Zahŕňa to údaje o prichádzajúcich a odchádzajúcich hovoroch.\n\nK zariadeniu [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ste sa predtým nikdy nepripojili."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Nedôveryhodné zariadenie <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> s rozhraním Bluetooth vyžaduje prístup k vašim kontaktom a zoznamu hovorov. Zahŕňa to údaje o prichádzajúcich a odchádzajúcich hovoroch.\n\nK zariadeniu <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> ste sa predtým nikdy nepripojili."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Jas"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Uzamknutá obrazovka"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Viditeľnosť"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Farba"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Iné"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 5433ff1..f2fa1ef 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -1269,11 +1269,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Končni čas"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Stanje"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intenzivnost"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Izklopljeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Brez samodejnega vklopa"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Samodejni vklop ob <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Samodejni vklop ob sončnem zahodu"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Vklopljeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Brez samodejnega izklopa"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Samodejni izklop ob <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Samodejni izklop ob sončnem vzhodu"</string>
@@ -1296,11 +1294,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Vklop od sončn. zahoda do vzhoda"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Vklop ob poljubni uri"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Stanje"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Izklopljeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Brez samodejnega vklopa"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Samodejni vklop ob sončnem zahodu"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Samodejni vklop ob <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Vklopljeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Brez samodejnega izklopa"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Samodejni izklop ob sončnem vzhodu"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Samodejni izklop ob <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2184,6 +2180,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Bralniki zaslona"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Zvok in besedilo na zaslonu"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Zaslon"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Kontrolniki za interakcije"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Prenesene aplikacije"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Poskusno"</string>
@@ -2519,7 +2517,7 @@
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Napravo uporabljate več kot običajno"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Baterija se bo morda izpraznila prej kot običajno"</string>
     <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optimizacija za ohranjanje zmogljivosti baterije"</string>
-    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Baterija je začasno omejena. Za več informacij se dotaknite."</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Poraba baterije je začasno omejena. Za več informacij se dotaknite."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Telefon ste uporabljali več kot običajno. Baterija se bo morda izpraznila prej, kot ste pričakovali.\n\nAplikacije, ki porabijo največ energije baterije:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Tablični računalnik ste uporabljali več kot običajno. Baterija se bo morda izpraznila prej, kot ste pričakovali.\n\nAplikacije, ki porabijo največ energije baterije:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Napravo ste uporabljali več kot običajno. Baterija se bo morda izpraznila prej, kot ste pričakovali.\n\nAplikacije, ki porabijo največ energije baterije:"</string>
@@ -3161,10 +3159,15 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Izbriši uporabnika"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Izbriši"</string>
     <string name="user_guest" msgid="4545590092001460388">"Gost"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Odstranitev gosta"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Želite odstraniti gosta?"</string>
+    <!-- no translation found for user_clear_guest_menu (4864362688187480452) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_menu (5064400453222497734) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_confirm_title (7526978959527761497) -->
+    <skip />
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Vse aplikacije in podatki v tej seji bodo izbrisani."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Odstrani"</string>
+    <!-- no translation found for user_exit_guest_dialog_remove (8095094235815676847) -->
+    <skip />
     <string name="user_enable_calling" msgid="264875360626905535">"Vklop telefonskih klicev"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Vklop telefonskih klicev in sporočil SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Brisanje uporabnika"</string>
@@ -3681,7 +3684,8 @@
     <string name="other_conversations" msgid="551178916855139870">"Neprednostni pogovori"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Pogovori, v katere ste vnesli spremembe"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Nedavni pogovori"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Počisti nedavne"</string>
+    <!-- no translation found for conversation_settings_clear_recents (4246342656145488662) -->
+    <skip />
     <string name="clear" msgid="5092178335409471100">"Počisti"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Prikaz prednostnih pogovorov v oblačkih"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Prednostni pogovori so prikazani na vrhu poteznega zaslona z obvestili. Nastavite lahko tudi, naj bodo prikazani v oblačkih in naj preglasijo način »ne moti«."</string>
@@ -4564,7 +4568,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Povezan z več napravami"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Predstavitveni način uporabniškega vmesnika sistema"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Temna tema"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Vklopljeno/začasno onemogočeno zaradi varčevanja z baterijo"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Začasno vklopljeno zaradi varčevanja z energijo baterije"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Podprte aplikacije bodo prav tako preklopile v temno temo"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"V redu"</string>
@@ -5229,15 +5234,34 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Nastavitve"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Povezovanje z javnimi omrežji"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"omrežna povezava, internet, brezžično, podatki, wifi, wi-fi, wi fi, mobilno omrežje, mobilno, mobilni operater, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Prikaži varna omrežja za uporabo v letalu"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Izklopi način za letalo"</string>
+    <!-- no translation found for view_airplane_safe_networks (9170023210981508906) -->
+    <skip />
+    <!-- no translation found for turn_off_airplane_mode (7141986366534514443) -->
+    <skip />
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Povezano"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Samodejna povezava z internetom ni mogoča"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Nobeno drugo omrežje ni na voljo"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Na voljo ni nobeno omrežje"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Ni na voljo, ker je vklopljen način za spanje"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Ponastavitev pomembnosti obvestil je dokončana."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Aplikacije"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Naprava, ki ni vredna zaupanja, želi dostopati do vaših sporočil. Dotaknite se za podrobnosti."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Želite dovoliti dostop do sporočil?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Naprava Bluetooth [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ki ni vredna zaupanja, želi dostopati do vaših sporočil.\n\nŠe nikoli niste vzpostavili povezave z napravo [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Naprava Bluetooth <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, ki ni vredna zaupanja, želi dostopati do vaših sporočil.\n\nŠe nikoli niste vzpostavili povezave z napravo <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Naprava, ki ni vredna zaupanja, želi dostopati do vaših stikov in dnevnika klicev. Dotaknite se za podrobnosti."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Želite dovoliti dostop do stikov in dnevnika klicev?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Naprava Bluetooth [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ki ni vredna zaupanja, želi dostopati do vaših stikov in dnevnika klicev. To vključuje podatke o dohodnih in odhodnih klicih.\n\nŠe nikoli niste vzpostavili povezave z napravo [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Naprava Bluetooth <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, ki ni vredna zaupanja, želi dostopati do vaših stikov in dnevnika klicev. To vključuje podatke o dohodnih in odhodnih klicih.\n\nŠe nikoli niste vzpostavili povezave z napravo <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
+    <!-- no translation found for category_name_brightness (8520372392029305084) -->
+    <skip />
+    <!-- no translation found for category_name_lock_display (7478785189102882266) -->
+    <skip />
+    <!-- no translation found for category_name_visibility (4485030512199246405) -->
+    <skip />
+    <!-- no translation found for category_name_color (937514550918977151) -->
+    <skip />
+    <!-- no translation found for category_name_others (2366006298768550310) -->
+    <skip />
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index c1dd2c2..6785fd6 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Koha e përfundimit"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Statusi"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intensiteti"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Joaktiv / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Nuk do të aktivizohet asnjëherë automatikisht"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Do të aktivizohet automatikisht në <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Do të aktivizohet automatikisht kur të perëndojë dielli"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Aktiv / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Nuk do të çaktivizohet asnjëherë automatikisht"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Do të çaktivizohet automatikisht në <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Do të çaktivizohet automatikisht në agim"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Aktivizohet nga perëndimi deri në agim"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Aktivizohet në kohë të personalizuar"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Statusi"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Joaktiv / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Nuk do të aktivizohet asnjëherë automatikisht"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Do të aktivizohet automatikisht kur të perëndojë dielli"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Do të aktivizohet automatikisht në <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Aktiv / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Nuk do të çaktivizohet asnjëherë automatikisht"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Do të çaktivizohet automatikisht në agim"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Do të çaktivizohet automatikisht në <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Lexuesit e ekranit"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audioja dhe teksti në ekran"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Ekrani"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Kontrollet e ndërveprimeve"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Aplikacionet e shkarkuara"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Eksperimentale"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Fshi përdoruesin"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Fshi"</string>
     <string name="user_guest" msgid="4545590092001460388">"I ftuar"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Hiq të ftuarin"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Të hiqet i ftuari?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Pastro të dhënat e vizitorit"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Jepi fund sesionit të vizitorit"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Dëshiron t\'i japësh fund sesionit të vizitorit?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Të gjitha aplikacionet dhe të dhënat në këtë sesion do të fshihen."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Hiq!"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Jepi fund sesionit"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Aktivizo telefonatat"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Aktivizo telefonatat dhe SMS-të"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Fshi përdoruesin"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Bisedat pa përparësi"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Bisedat ku ke bërë ndryshime"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Bisedat e fundit"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Pastro të fundit"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Pastro të gjitha të fundit"</string>
     <string name="clear" msgid="5092178335409471100">"Pastro"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Shfaq flluskën për bisedat me përparësi"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Bisedat me përparësi shfaqen në krye të strehës me tërheqje poshtë. Mund t\'i caktosh po ashtu që të shfaqen si flluskë dhe të ndërpresin \"Mos shqetëso\"."</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Lidhur me shumë pajisje"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Modaliteti i demonstrimit i ndërfaqes së përdoruesit të sistemit"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Tema e errët"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Aktive / Çaktivizuar për shkak të \"Kursyesit të baterisë\""</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Aktivizuar përkohësisht për shkak të \"Kursyesit të baterisë\""</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Aplikacionet e mbështetura do të kalojnë po ashtu te tema e errët"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"E kuptova"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferencat"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Lidhu me rrjetet publike"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"lidhja e rrjetit, internet, pa tel, të dhëna, wifi, wi-fi, wi fi, rrjeti celular, celular, operatori celular, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Shiko rrjetet e sigurta për në aeroplan"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Çaktivizo \"Modalitetin e aeroplanit\""</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Shiko rrjetet e modalitetit të aeroplanit"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Çaktivizo modalitetin e aeroplanit"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Lidhur"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Interneti nuk do të lidhet automatikisht"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Nuk ofrohet asnjë rrjet tjetër"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Nuk ofrohet asnjë rrjet"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Nuk ofrohet sepse modaliteti i orarit të gjumit është aktiv"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Rivendosja e rëndësisë së njoftimit përfundoi."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Aplikacionet"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Një pajisje jo e besuar kërkon të ketë qasje te mesazhet e tua. Trokit për detaje."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Të lejohet qasja te mesazhet?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Një pajisje jo e besuar me Bluetooth, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], kërkon të ketë qasje te mesazhet e tua.\n\nNuk je lidhur me [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] më parë."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Një pajisje jo e besuar me Bluetooth, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, kërkon të ketë qasje te mesazhet e tua.\n\nNuk je lidhur me <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> më parë."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Një pajisje jo e besuar kërkon të ketë qasje te kontaktet dhe evidenca e telefonatave. Trokit për detaje."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Të lejohet qasja te kontaktet dhe evidenca e telefonatave?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Një pajisje jo e besuar me Bluetooth, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], kërkon të ketë qasje te kontaktet dhe evidenca e telefonatave. Kjo përfshin të dhënat në lidhje me telefonatat hyrëse dhe dalëse.\n\nNuk je lidhur me [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] më parë."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Një pajisje jo e besuar me Bluetooth, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, kërkon të ketë qasje te kontaktet dhe evidenca e telefonatave. Kjo përfshin të dhënat në lidhje me telefonatat hyrëse dhe dalëse.\n\nNuk je lidhur me <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> më parë."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Ndriçimi"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Ekrani i kyçjes"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Shikueshmëria"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Ngjyra"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Të tjera"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 600929b..4be3fe9 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -1249,11 +1249,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Време завршетка"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Статус"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Интензитет"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Искључено/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Никада се не укључује аутоматски"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Укључује се аутоматски у <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Укључује се аутоматски када сунце зађе"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Укључено/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Никада се не искључује аутоматски"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Искључује се аутоматски у <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Искључује се аутоматски када сунце изађе"</string>
@@ -1276,11 +1274,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Укључује се од сумрака до свитања"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Укључује се у жељено време"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Статус"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Искључено/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Никада се не укључује аутоматски"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Укључује се аутоматски када сунце зађе"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Укључује се аутоматски у <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Укључено/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Никада се не искључује аутоматски"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Искључује се аутоматски када сунце изађе"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Искључује се аутоматски у <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2160,6 +2156,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Читачи екрана"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Звук и текст на екрану"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Приказ"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Контроле интеракције"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Преузете апликације"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Експериментално"</string>
@@ -2487,7 +2485,7 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Таблет сте користили дуже него обично"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Уређај сте користили дуже него обично"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Батерија може да се испразни раније него обично"</string>
-    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Оптимизује се ради доброг стања батерије"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Оптимизује се ради бољег стања батерије"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Батерија је тренутно ограничена. Додирните да бисте сазнали више."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Уређај сте користили дуже него обично. Батерија може да се испразни раније од очекиваног.\n\nАпликације са највећом потрошњом батерије:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Таблет сте користили дуже него обично. Батерија може да се испразни раније од очекиваног.\n\nАпликације са највећом потрошњом батерије:"</string>
@@ -3118,10 +3116,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Брисање корисника"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Избриши"</string>
     <string name="user_guest" msgid="4545590092001460388">"Гост"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Уклони госта"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Желите ли да уклоните госта?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Обриши податке госта"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Заврши сесију госта"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Желите да завршите сесију госта?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Све апликације и подаци у овој сесији ће бити избрисани."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Уклони"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Заврши сесију"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Укључи телефонске позиве"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Укључи телефонске позиве и SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Избришите корисника"</string>
@@ -3636,7 +3635,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Конверзације које нису приоритетне"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Конверзације које сте мењали"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Недавне конверзације"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Обриши недавно"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Обриши све недавно"</string>
     <string name="clear" msgid="5092178335409471100">"Обриши"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Прикажи приоритетне конверзације у облачићима"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Приоритетне конверзације се приказују у врху клизног панела. Можете и да их подесите тако да имају облачиће и да прекидају режим Не узнемиравај."</string>
@@ -4494,7 +4493,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Повезан је са више уређаја"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Режим демонстрације за кориснички интерфејс система"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Тамна тема"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Укључено/Привремено онемогућено због Уштеде батерије"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Привремено укључено због Уштеде батерије"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Подржане апликације ће такође прећи на тамну тему"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Важи"</string>
@@ -5146,15 +5146,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Подешавања"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Повежите се са јавним мрежама"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"мрежна веза, интернет, бежично, подаци, wifi, wi-fi, wi fi, мобилни телефон, мобилни, мобилни оператер, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Прикажи мреже безбедне за авион"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Искључи режим рада у авиону"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Прикажи мреже за режим рада у авиону"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Искључите режим рада у авиону"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Повезано"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Аутоматско повезивање на интернет није могуће"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Није доступна ниједна друга мрежа"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Нема доступних мрежа"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Недоступно је јер је ноћни режим укључен"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Ресетовање важности обавештења је довршено."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Апликације"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Непоуздани уређај жели да приступа порукама. Додирните за детаље."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Желите ли да дозволите приступ порукама?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Непоуздани Bluetooth уређај, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], жели да приступа порукама.\n\nРаније се нисте повезивали са уређајем [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Непоуздани Bluetooth уређај, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, жели да приступа порукама.\n\nРаније се нисте повезивали са уређајем <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Непоуздани уређај жели да приступа контактима и евиденцији позива. Додирните за детаље."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Желите ли да дозволите приступ контактима и евиденцији позива?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Непоуздани Bluetooth уређај, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], жели да приступа контактима и евиденцији позива. То обухвата податке о долазним и одлазним позивима.\n\nРаније се нисте повезивали са уређајем [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Непоуздани Bluetooth уређај, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, жели да приступа контактима и евиденцији позива. То обухвата податке о долазним и одлазним позивима.\n\nРаније се нисте повезивали са уређајем <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Осветљеност"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Закључајте екран"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Видљивост"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Боја"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Друго"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index b79358a..e5eec59 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Sluttid"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Status"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intensitet"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Av/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Aktiveras aldrig automatiskt"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Aktiveras automatiskt kl. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Aktiveras automatiskt när solen går ned"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"På/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Inaktiveras aldrig automatiskt"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Inaktiveras automatiskt kl. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Inaktiveras automatiskt när solen går upp"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"På fr. solnedgång t. soluppgång"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Aktiveras vid anpassad tid"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Status"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Av/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Aktiveras aldrig automatiskt"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Aktiveras automatiskt vid solnedgången"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Aktiveras automatiskt kl. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"På/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Inaktiveras aldrig automatiskt"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Inaktiveras automatiskt vid soluppgången"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Inaktiveras automatiskt kl. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Skärmläsningsprogram"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Ljud och text på skärmen"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Skärm"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Interaktionsinställningar"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Nedladdade appar"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Experimentella"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Ta bort användare"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Ta bort"</string>
     <string name="user_guest" msgid="4545590092001460388">"Gäst"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Ta bort gäst"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Vill du ta bort gästen?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Rensa gästdata"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Avsluta gästsession"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Vill du avsluta gästsessionen?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Alla appar och data i denna session kommer att raderas."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Ta bort"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Avsluta session"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Aktivera telefonsamtal"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Aktivera telefonsamtal och sms"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Radera användare"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Icke-prioriterade konversationer"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Konversationer som du har ändrat"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Aktuella konversationer"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Rensa de senaste"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Rensa alla senaste"</string>
     <string name="clear" msgid="5092178335409471100">"Rensa"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Visa prioriterade konversationer i bubblor"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Prioriterade konversationer visas högst upp i aviseringspanelen. Du kan även ställa in så att de visas i bubblor och kringgår Stör ej."</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Ansluten till flera enheter"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Demoläge för systemgränssnitt"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Mörkt tema"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"På/tillfälligt inaktiverat i batterisparläge"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Tillfälligt aktiverat i batterisparläge"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Mörkt tema aktiveras även för appar som stöds"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"OK"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Inställningar"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Anslut till offentliga nätverk"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"nätverksanslutning, internet, trådlös, data, wifi, wi-fi, wi fi, mobil, telefon, mobiloperatör, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Visa nätverk som är flygplanssäkra"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Inaktivera flygplansläge"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Visa nätverk med flygplansläge"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Inaktivera flygplansläge"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Ansluten"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Du ansluts inte automatiskt till internet"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Inga andra nätverk är tillgängliga"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Det finns inga tillgängliga nätverk"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Inte tillgängligt eftersom sovläget är på"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Aviseringarnas relevans har återställts."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Appar"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"En enhet som inte är betrodd vill få åtkomst till dina meddelanden. Tryck här för mer information."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Vill du tillåta åtkomst till meddelanden?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"En Bluetooth-enhet som inte är betrodd, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], vill få åtkomst till dina meddelanden.\n\nDu har inte anslutit till [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] tidigare."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"En Bluetooth-enhet som inte är betrodd, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, vill få åtkomst till dina meddelanden.\n\nDu har inte anslutit till <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> tidigare."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"En enhet som inte är betrodd vill få åtkomst till dina kontakter och samtalshistoriken. Tryck här för mer information."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Vill du tillåta åtkomst till kontakter och samtalshistorik?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"En Bluetooth-enhet som inte är betrodd, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], vill få åtkomst till dina kontakter och samtalshistoriken. Detta inkluderar data om inkommande och utgående samtal.\n\nDu har inte anslutit till [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] tidigare."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"En Bluetooth-enhet som inte är betrodd, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, vill få åtkomst till dina kontakter och samtalshistoriken. Detta inkluderar data om inkommande och utgående samtal.\n\nDu har inte anslutit till <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> tidigare."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Ljusstyrka"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Låsskärm"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Synlighet"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Färg"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Annat"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 3813459..e16a56d 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Kuzima"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Hali"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Ukolezaji"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Umezimwa. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Hautawahi kuwashwa kiotomatiki"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Itawashwa kiotomatiki saa <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Itawashwa kiotomatiki jua litakapotua"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Imewashwa. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Haitawahi kuzimwa kiotomatiki"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Itazimwa kiotomatiki saa <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Itazima kiotomatiki kutakapopambazuka"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Washa usiku kucha"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Washa wakati maalum"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Hali"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Yamezimwa. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Hayatawahi kuwashwa kiotomatiki"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Itawashwa kiotomatiki jua litakapotua"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Itawaka kiotomatiki saa <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Imewashwa / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Haitawahi kuzimwa kiotomatiki"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Itazima kiotomatiki kutakapopambazuka"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Itazima kiotomatiki saa <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Visomaji skrini"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Maandishi kwenye skrini na sauti"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Skrini"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Vidhibiti vya mawasiliano"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Programu ulizopakua"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Ya majaribio"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Futa mtumiaji"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Futa"</string>
     <string name="user_guest" msgid="4545590092001460388">"Mgeni"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Ondoa mgeni"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Ungependa kumwondoa mgeni?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Futa data ya mgeni"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Maliza kipindi cha mgeni"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Ungependa kumaliza kipindi cha mgeni?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Data na programu zote katika kipindi hiki zitafutwa."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Ondoa"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Maliza kipindi"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Ruhusu upigaji simu"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Washa kipengele cha SMS na kupiga simu"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Futa mtumiaji"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Mazungumzo yasiyopewa kipaumbele"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Mazungumzo uliyofanyia mabadiliko"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Mazungumzo ya hivi majuzi"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Futa ya hivi majuzi"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Futa zote za hivi majuzi"</string>
     <string name="clear" msgid="5092178335409471100">"Futa"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Yafanye mazungumzo ya kipaumbele yatoe viputo"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Mazungumzo ya kipaumbele huonekana juu ya menyu inayovutwa chini. Unaweza pia kuyafanya yatoe viputo na kukatiza kipengele cha Usinisumbue."</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Imeunganishwa kwenye vifaa vingi"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Hali ya onyesho la kiolesura cha mfumo"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Mandhari meusi"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Imewashwa / Imezimwa kwa muda kwa sababu ya Kiokoa Betri"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Imewashwa kwa muda kwa sababu ya Kiokoa Betri"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Programu zinazotumika pia zitabadili zitumie mandhari meusi"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Nimeelewa"</string>
@@ -5064,15 +5064,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Mapendeleo"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Unganisha kwenye mitandao ya umma"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"muunganisho wa mtandao, intaneti, isiyotumia waya, data, wifi, wi-fi, wi fi, mtandao wa simu, vifaa vya mkononi, mtoa huduma za vifaa vya mkononi, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Angalia mitandao salama ya ndegeni"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Zima Hali ya Ndegeni"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Angalia mitandao ya hali ya ndegeni"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Zima hali ya ndegeni"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Imeunganishwa"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Intaneti haitaunganishwa kiotomatiki"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Hakuna mitandao mingine inayopatikana"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Hakuna mitandao inayopatikana"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Haipatikani kwa sababu umewasha hali ya wakati umelala"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Imemaliza kubadilisha mipangilio ya umuhimu wa arifa."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Programu"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Kifaa kisichoaminika kinataka kufikia ujumbe wako. Gusa ili upate maelezo."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Ungependa kuruhusu kifaa kifikie ujumbe?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Kifaa cha Bluetooth kisichoaminika, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], kinataka kufikia ujumbe wako.\n\nHujawahi kuunganisha kwenye [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Kifaa cha Bluetooth kisichoaminika, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, kinataka kufikia ujumbe wako.\n\nHujawahi kuunganisha kwenye <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Kifaa kisichoaminika kinataka kufikia anwani na rekodi yako ya nambari za simu. Gusa ili upate maelezo."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Ungependa kuruhusu kifaa kifikie anwani na rekodi ya nambari za simu?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Kifaa cha Bluetooth kisichoaminika, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], kinataka kufikia anwani na rekodi yako ya nambari za simu. Hii ni pamoja na data kuhusu simu unazopigiwa na unazopiga.\n\nHujawahi kuunganisha kwenye [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Kifaa cha Bluetooth kisichoaminika, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, kinataka kufikia anwani na rekodi yako ya nambari za simu. Hii ni pamoja na data kuhusu simu unazopigiwa na unazopiga.\n\nHujawahi kuunganisha kwenye <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Ung\'aavu"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Skrini Iliyofungwa"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Mwonekano"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Rangi"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Vingine"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 7521958..8c1ee18 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -312,8 +312,8 @@
     <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"சாதனம் என்கிரிப்ட் செய்யப்படவில்லை"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"பூட்டுத் திரை"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"எதைக் காட்ட வேண்டும்"</string>
-    <string name="security_settings_summary" msgid="1627059516127354233">"எனது இருப்பிடம், திரை திற, சிம் கார்டு பூட்டு, நற்சான்று சேமிப்பிட பூட்டு ஆகியவற்றை அமைக்கவும்"</string>
-    <string name="cdma_security_settings_summary" msgid="2455517905101186330">"எனது இருப்பிடம், திரையைத் திற, நற்சான்று சேமிப்பிடப் பூட்டு ஆகியவற்றை அமைக்கவும்"</string>
+    <string name="security_settings_summary" msgid="1627059516127354233">"எனது இருப்பிடம், திரை திற, சிம் கார்டு பூட்டு, அனுமதிச் சான்று சேமிப்பக பூட்டு ஆகியவற்றை அமைக்கவும்"</string>
+    <string name="cdma_security_settings_summary" msgid="2455517905101186330">"எனது இருப்பிடம், திரையைத் திற, அனுமதிச் சான்று சேமிப்பகப் பூட்டு ஆகியவற்றை அமைக்கவும்"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"தனியுரிமை"</string>
     <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"கிடைக்கவில்லை"</string>
     <string name="security_status_title" msgid="6958004275337618656">"பாதுகாப்பு நிலை"</string>
@@ -557,7 +557,7 @@
     <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"பயோமெட்ரிக்ஸும் கடவுச்சொல்லும்"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"பயோமெட்ரிக்ஸ் இல்லாமல் தொடர்க"</string>
     <string name="biometrics_unlock_title" msgid="7769374223959937435">"பயோமெட்ரிக்ஸைப் பயன்படுத்தி உங்கள் மொபைலைத் திறக்கலாம். பாதுகாப்பிற்காக மாற்றுத் திரைப் பூட்டையும் அமைப்பது அவசியம்."</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"நிர்வாகி, என்கிரிப்ஷன் பாலிசி/நற்சான்று சேமிப்பகம் காரணமாக முடக்கப்பட்டது"</string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"நிர்வாகி, என்கிரிப்ஷன் பாலிசி/அனுமதிச் சான்று சேமிப்பகம் காரணமாக முடக்கப்பட்டது"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"ஏதுமில்லை"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"ஸ்வைப்"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="1926480143883094896">"பேட்டர்ன்"</string>
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"முடிவு நேரம்"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"நிலை"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"ஒளிச்செறிவு"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"ஆஃப் / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"ஒருபோதும் தானாக இயக்கப்படாது"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"<xliff:g id="ID_1">%1$s</xliff:g>க்குத் தானாக இயக்கப்படும்"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"சூரிய அஸ்தமனத்தின் போது தானாக இயக்கப்படும்"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"இயக்கத்தில் / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"ஒருபோதும் தானாக முடக்கப்படாது"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"<xliff:g id="ID_1">%1$s</xliff:g>க்குத் தானாக முடக்கப்படும்"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"சூரிய உதயத்தின் போது தானாக முடக்கப்படும்"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"மாலை முதல் காலை வரை ஆன் செய்யும்"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"குறிப்பிட்ட நேரத்தில் இயக்கும்"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"நிலை"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"ஆஃப் / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"ஒருபோதும் தானாக இயக்கப்படாது"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"சூரிய அஸ்தமனத்தின் போது தானாக இயக்கப்படும்"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"<xliff:g id="ID_1">%1$s</xliff:g>க்குத் தானாக இயக்கப்படும்"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"ஆன் / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"ஒருபோதும் தானாக முடக்கப்படாது"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"சூரிய உதயத்தின் போது தானாக முடக்கப்படும்"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"<xliff:g id="ID_1">%1$s</xliff:g>க்குத் தானாக முடக்கப்படும்"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"திரைப் படிப்பான்கள்"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ஆடியோ &amp; திரையில் காட்டப்படும் உரை"</string>
     <string name="display_category_title" msgid="6638191682294461408">"திரை அமைப்பு"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"ஊடாடல் கட்டுப்பாடுகள்"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"பதிவிறக்கிய ஆப்ஸ்"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"பரிசோதனை முயற்சி"</string>
@@ -2697,7 +2695,7 @@
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
     <string name="adaptive_connectivity_title" msgid="7464959640138428192">"சூழல்சார் இணைப்புநிலை"</string>
     <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"உங்கள் நெட்வொர்க் இணைப்புகளைத் தானாக நிர்வகிப்பதன் மூலம் பேட்டரி நிலையை நீட்டிப்பதோடு சாதனச் செயல்திறனையும் மேம்படுத்தும்"</string>
-    <string name="credentials_title" msgid="7535942196886123656">"அனுமதிச் சான்று சேமிப்பிடம்"</string>
+    <string name="credentials_title" msgid="7535942196886123656">"அனுமதிச் சான்று சேமிப்பகம்"</string>
     <string name="credentials_install" msgid="3933218407598415827">"சான்றிதழை நிறுவுதல்"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"சேமிப்பிடத்திலிருந்து சான்றிதழ்களை நிறுவு"</string>
     <string name="credentials_install_summary" product="default" msgid="8161351950524166012">"SD கார்டிலிருந்து சான்றிதழ்களை நிறுவு"</string>
@@ -2712,8 +2710,8 @@
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN மற்றும் பயன்பாடுகளுக்காக நிறுவியது"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"வைஃபைக்காக நிறுவியது"</string>
     <string name="credentials_reset_hint" msgid="4054601857203464867">"எல்லா உள்ளடக்கத்தையும் அகற்றவா?"</string>
-    <string name="credentials_erased" msgid="9121052044566053345">"நற்சான்றிதழ் சேமிப்பிடம் அழிக்கப்பட்டது."</string>
-    <string name="credentials_not_erased" msgid="3611058412683184031">"நற்சான்று சேமிப்பிடத்தை அழிக்க முடியாது."</string>
+    <string name="credentials_erased" msgid="9121052044566053345">"அனுமதிச் சான்று சேமிப்பகம் அழிக்கப்பட்டது."</string>
+    <string name="credentials_not_erased" msgid="3611058412683184031">"அனுமதிச் சான்று சேமிப்பகத்தை அழிக்க முடியாது."</string>
     <string name="usage_access_title" msgid="1580006124578134850">"உபயோக அணுகலுடைய ஆப்ஸ்"</string>
     <string name="ca_certificate" msgid="3076484307693855611">"CA சான்றிதழ்"</string>
     <string name="user_certificate" msgid="6897024598058566466">"VPN &amp; ஆப்ஸ் பயனர் சான்றிதழ்"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"பயனரை நீக்கு"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"நீக்கு"</string>
     <string name="user_guest" msgid="4545590092001460388">"கெஸ்ட்"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"கெஸ்ட்டை அகற்று"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"கெஸ்ட்டை அகற்றவா?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"விருந்தினர் தரவை அழி"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"விருந்தினர் அமர்வை நிறைவுசெய்"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"விருந்தினர் அமர்வை நிறைவுசெய்யவா?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"இந்த அமர்வின் எல்லா பயன்பாடுகளும், தரவும் நீக்கப்படும்."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"அகற்று"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"அமர்வை நிறைவுசெய்"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"ஃபோன் அழைப்புகளை இயக்கு"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"ஃபோன் அழைப்புகள் &amp; SMSஐ இயக்கு"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"பயனரை நீக்குதல்"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"முன்னுரிமை அளிக்கப்படாத உரையாடல்கள்"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"நீங்கள் மாற்றங்களைச் செய்த உரையாடல்கள்"</string>
     <string name="recent_conversations" msgid="471678228756995274">"சமீபத்திய உரையாடல்கள்"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"சமீபத்தியவற்றை அழி"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"சமீபத்தியவையை அகற்று"</string>
     <string name="clear" msgid="5092178335409471100">"அழி"</string>
     <string name="important_bubble" msgid="7911698275408390846">"முக்கியமான உரையாடல்களைக் குமிழாக்கு"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"அறிவிப்பு விபரத்தின் மேற்பகுதியில் முக்கியமான உரையாடல்களைக் காட்டும். அவற்றைக் குமிழாகவும் ‘தொந்தரவு செய்ய வேண்டாம்’ குறுக்கீடு செய்யும் வகையிலும் அமைக்கலாம்."</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"பல சாதனங்களுடன் இணைக்கப்பட்டுள்ளது"</string>
     <string name="demo_mode" msgid="6566167465451386728">"சிஸ்டம் பயனர் இடைமுக டெமோ பயன்முறை"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"டார்க் தீம்"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"ஆன் / பேட்டரி சேமிப்பான் காரணமாக தற்காலிகமாக முடக்கப்பட்டது"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"பேட்டரி சேமிப்பான் காரணமாக தற்காலிகமாக ஆன் செய்யப்பட்டது"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"ஆதரவளிக்கப்பட்ட ஆப்ஸும் டார்க் தீமிற்கு மாறும்"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"சரி"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"விருப்பத்தேர்வுகள்"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"பொது நெட்வொர்க்குகளுடன் இணைக்கலாம்"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"நெட்வொர்க் இணைப்பு, இணையம், வயர்லெஸ், டேட்டா, வைஃபை, வை-ஃபை, வை ஃபை, செல்லுலார், மொபைல், செல் கேரியர், 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"விமான-பாதுகாப்பு நெட்வொர்க்குகளை காட்டு"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"விமானப் பயன்முறையை ஆஃப் செய்"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"விமானப் பயன்முறை நெட்வொர்க்குகளை காட்டு"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"விமானப் பயன்முறையை ஆஃப் செய்"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"இணைக்கப்பட்டது"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"இணையத்துடன் தானாகவே இணைக்காது"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"வேறு நெட்வொர்க்குகள் எதுவும் கிடைக்கவில்லை"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"நெட்வொர்க்குகள் எதுவும் கிடைக்கவில்லை"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"உறக்கநேரப் பயன்முறை ஆன் செய்யப்பட்டுள்ளதால் கிடைக்காது"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"அறிவிப்பு முக்கியத்துவம் மீட்டமைக்கப்பட்டது."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"ஆப்ஸ்"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"நம்பகமற்ற சாதனம் ஒன்று உங்கள் மெசேஜ்களை அணுக விரும்புகிறது. விவரங்களைப் பார்க்க தட்டவும்."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"மெசேஜ்களை அணுக அனுமதிக்கவா?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"[<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] எனும் நம்பகமற்ற புளூடூத் சாதனம் ஒன்று உங்கள் மெசேஜ்களை அணுக விரும்புகிறது.\n\nநீங்கள் இதற்குமுன் [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] சாதனத்துடன் இணைத்ததில்லை."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> எனும் நம்பகமற்ற புளூடூத் சாதனம் உங்கள் மெசேஜ்களை அணுக விரும்புகிறது.\n\nநீங்கள் இதற்குமுன் <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> சாதனத்துடன் இணைத்ததில்லை."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"நம்பகமற்ற சாதனம் ஒன்று உங்கள் தொடர்புகளையும் அழைப்புப் பதிவையும் அணுக விரும்புகிறது. விவரங்களைப் பார்க்க தட்டவும்."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"தொடர்புகளையும் அழைப்புப் பதிவையும் அணுக அனுமதிக்கவா?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"[<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] எனும் நம்பகமற்ற புளூடூத் சாதனம் ஒன்று உங்கள் தொடர்புகளையும் அழைப்புப் பதிவையும் அணுக விரும்புகிறது. உள்வரும், வெளிச்செல்லும் அழைப்புகளைப் பற்றிய தரவும் இதில் அடங்கும்.\n\nநீங்கள் இதற்குமுன் [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] சாதனத்துடன் இணைத்ததில்லை."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> எனும் நம்பகமற்ற புளூடூத் சாதனம் உங்கள் தொடர்புகளையும் அழைப்புப் பதிவையும் அணுக விரும்புகிறது. உள்வரும் மற்றும் வெளிச்செல்லும் அழைப்புகளைப் பற்றிய தரவும் இதில் அடங்கும்.\n\nநீங்கள் இதற்குமுன் <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> சாதனத்துடன் இணைத்ததில்லை."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"ஒளிர்வு"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"பூட்டுத் திரை"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"தெரிவுநிலை"</string>
+    <string name="category_name_color" msgid="937514550918977151">"வண்ணம்"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"மற்றவை"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 3165c4b..2f9a33a 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"ముగింపు సమయం"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"స్థితి"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"తీవ్రత"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"ఆఫ్‌లో ఉంది / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"ఎప్పటికీ ఆటోమేటిక్‌గా ఆన్ కాదు"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"<xliff:g id="ID_1">%1$s</xliff:g>కి స్వయంచాలకంగా ఆన్ అవుతుంది"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"సూర్యాస్తమయ సమయానికి ఆటోమేటిక్‌గా ఆన్ అవుతుంది"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"ఆన్‌లో ఉంది / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"ఎప్పటికీ స్వయంచాలకంగా ఆఫ్ కాదు"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"<xliff:g id="ID_1">%1$s</xliff:g>కి ఆటోమేటిక్‌గా ఆఫ్ అవుతుంది"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"సూర్యోదయ సమయానికి ఆటోమేటిక్‌గా ఆఫ్ అవుతుంది"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"రాత్రి సమయం అంతా ఆన్ అవుతుంది"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"అనుకూల సమయంలో ఆన్ చేయబడుతుంది"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"స్టేటస్"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"ఆఫ్ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"ఎన్నటికీ ఆటోమేటిక్‌గా ఆన్ కాదు"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"సూర్యాస్తమయానికి ఆటోమేటిక్‌గా ఆన్ అవుతుంది"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"<xliff:g id="ID_1">%1$s</xliff:g>కు ఆటోమేటిక్‌గా ఆన్ అవుతుంది"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"ఆన్ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"ఎన్నటికీ ఆటోమేటిక్‌గా ఆఫ్ కాదు"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"సూర్యోదయ వేళకు ఆటోమేటిక్‌గా ఆఫ్ అవుతుంది"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"<xliff:g id="ID_1">%1$s</xliff:g>కు ఆటోమేటిక్‌గా ఆఫ్ అవుతుంది"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"స్క్రీన్ రీడర్‌లు"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ఆడియో &amp; స్క్రీన్‌పై ఉండే టెక్స్ట్"</string>
     <string name="display_category_title" msgid="6638191682294461408">"డిస్‌ప్లే"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"పరస్పర చర్య నియంత్రణలు"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"డౌన్‌లోడ్ చేసిన యాప్‌లు"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"ప్రయోగాత్మకం"</string>
@@ -2456,7 +2454,7 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"టాబ్లెట్ సాధారణం కంటే ఎక్కువగా వినియోగించింది"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"పరికరం సాధారణం కంటే ఎక్కువగా వినియోగించింది"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"బ్యాటరీ సాధారణం కంటే తక్కువ సమయం రావచ్చు"</string>
-    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"బ్యాటరీ జీవితకాలాన్ని ఆప్టిమైజ్ చేయడం కోసం"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"బ్యాటరీ జీవితకాలాన్ని పెంచడం కోసం ఆప్టిమైజ్ చేస్తోంది"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"బ్యాటరీ తాత్కాలికంగా పరిమితం చేయబడింది. మరింత తెలుసుకోవడానికి ట్యాప్ చేయండి."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"మీ ఫోన్ సాధారణం కంటే అధికంగా వినియోగించబడింది. కనుక, మీ బ్యాటరీ, అంచ‌నా వేసిన దాని కంటే తక్కువ సమయంలోనే ఖాళీ అవ్వొచ్చు.\n\nబ్యాటరీని అధికంగా వినియోగిస్తోన్న ప్రధాన యాప్‌లు:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"మీ టాబ్లెట్ సాధారణం కంటే అధికంగా వినియోగించబడింది. కనుక, మీ బ్యాటరీ, అంచ‌నా వేసిన దాని కంటే తక్కువ సమయంలోనే ఖాళీ అవ్వొచ్చు.\n\nబ్యాటరీని అధికంగా వినియోగిస్తోన్న ప్రధాన యాప్‌లు:"</string>
@@ -3075,10 +3073,15 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"వినియోగదారుని తొలగించండి"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"తొలగించు"</string>
     <string name="user_guest" msgid="4545590092001460388">"అతిథి"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"అతిథిని తీసివేయండి"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"అతిథిని తీసివేయాలా?"</string>
+    <!-- no translation found for user_clear_guest_menu (4864362688187480452) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_menu (5064400453222497734) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_confirm_title (7526978959527761497) -->
+    <skip />
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"ఈ సెషన్‌లోని అన్ని అనువర్తనాలు మరియు డేటా తొలగించబడతాయి."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"తీసివేయి"</string>
+    <!-- no translation found for user_exit_guest_dialog_remove (8095094235815676847) -->
+    <skip />
     <string name="user_enable_calling" msgid="264875360626905535">"ఫోన్ కాల్‌లను ఆన్ చేయి"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"ఫోన్ కాల్‌లు &amp; SMS ఆన్ చేయి"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"వినియోగదారుని తొలగించు"</string>
@@ -3591,7 +3594,8 @@
     <string name="other_conversations" msgid="551178916855139870">"ప్రాధాన్యత లేని సంభాషణలు"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"మీరు మార్పులు చేసిన సంభాషణలు"</string>
     <string name="recent_conversations" msgid="471678228756995274">"ఇటీవలి సంభాషణలు"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"ఇటీవలివి క్లియర్"</string>
+    <!-- no translation found for conversation_settings_clear_recents (4246342656145488662) -->
+    <skip />
     <string name="clear" msgid="5092178335409471100">"క్లియర్ చేయండి"</string>
     <string name="important_bubble" msgid="7911698275408390846">"బబుల్ ప్రముఖ సంభాషణ"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"కిందకు-లాగే షేడ్ ఎగువ భాగంలో ప్రాముఖ్యమైన సంభాషణలు కనిపిస్తాయి. అవి ఒక బబుల్ రూపంలో వచ్చి \'అంతరాయం కలిగించవద్దు\' మోడ్‌ను అధిగమించేలా కూడా మీరు సెట్ చేయవచ్చు."</string>
@@ -4426,7 +4430,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"బహుళ పరికరాలకు కనెక్ట్ చేయబడింది"</string>
     <string name="demo_mode" msgid="6566167465451386728">"సిస్టమ్ UI డెమో మోడ్"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"ముదురు రంగు రూపం"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"బ్యాటరీ సేవర్ వలన ఆన్ అయింది / తాత్కాలికంగా నిలిపివేయబడింది"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"బ్యాటరీ సేవర్ కారణంగా తాత్కాలికంగా ఆన్ చేయబడింది"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"మద్దతు గల యాప్‌లు కూడా ముదురు రంగు థీమ్‌కు మార్చబడతాయి"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"అర్థమైంది"</string>
@@ -5065,15 +5070,34 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ప్రాధాన్యతలు"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"పబ్లిక్ నెట్‌వర్క్‌లకు కనెక్ట్ అవ్వండి"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"నెట్‌వర్క్ కనెక్షన్, ఇంటర్‌నెట్, వైర్‌లెస్, డేటా, Wi-Fi, Wi-Fi, Wi-Fi, సెల్యూలార్, మొబైల్, సెల్ క్యారియర్, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"విమానం‑సురక్షిత నెట్‌వర్క్‌లను చూడండి"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"విమానం మోడ్‌ను ఆఫ్ చేయండి"</string>
+    <!-- no translation found for view_airplane_safe_networks (9170023210981508906) -->
+    <skip />
+    <!-- no translation found for turn_off_airplane_mode (7141986366534514443) -->
+    <skip />
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"కనెక్ట్ చేయబడింది"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"ఇంటర్నెట్ ఆటోమెటిక్‌గా కనెక్ట్ అవ్వదు"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"ఇతర నెట్‌వర్క్‌లేవీ అందుబాటులో లేవు"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"నెట్‌వర్క్‌లు అందుబాటులో లేవు"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"బెడ్ టైమ్ మోడ్ ఆన్‌లో ఉండడం వల్ల అందుబాటులో లేదు"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"రీసెట్ నోటిఫికేషన్ ప్రాముఖ్యత పూర్తయింది."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"యాప్‌లు"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"విశ్వసనీయం కానటువంటి పరికరం మీ మెసేజ్‌లను యాక్సెస్ చేయాలని కోరుకుంటోంది. వివరాల కోసం ట్యాప్ చేయండి."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"మెసేజ్‌లకు యాక్సెస్‌ను అనుమతించాలా?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"విశ్వసనీయం కానటువంటి బ్లూటూత్ పరికరం, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], మీ మెసేజ్‌లను యాక్సెస్ చేయాలనుకుంటోంది.\n\nమీరు ఇంతకు ముందెన్నడూ [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]కు కనెక్ట్ కాలేదు."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"విశ్వసనీయం కానటువంటి బ్లూటూత్ పరికరం, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, మీ మెసేజ్‌లను యాక్సెస్ చేయాలనుకుంటోంది.\n\nమీరు ఇంతకు ముందెన్నడూ <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>కు కనెక్ట్ కాలేదు."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"విశ్వసనీయం కాని పరికరం మీ కాంటాక్ట్‌లు, కాల్ లాగ్‌ను యాక్సెస్ చేయాలనుకుంటోంది. వివరాల కోసం ట్యాప్ చేయండి."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"కాంటాక్ట్‌లకు, కాల్ లాగ్‌కు యాక్సెస్‌ను అనుమతించాలా?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"విశ్వసనీయం కానటువంటి బ్లూటూత్ పరికరం, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], మీ కాంటాక్ట్‌లను, కాల్ లాగ్‌ను యాక్సెస్ చేయాలనుకుంటోంది. ఇది ఇన్‌కమింగ్, అవుట్‌గోయింగ్ కాల్‌ల డేటాతో కూడి ఉంటుంది.\n\nమీరు ఇంతకు ముందెన్నడూ [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]కు కనెక్ట్ కాలేదు."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"విశ్వసనీయం కానటువంటి బ్లూటూత్ పరికరం, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, మీ కాంటాక్ట్‌లను, కాల్ లాగ్‌ను యాక్సెస్ చేయాలనుకుంటోంది. ఇది ఇన్‌కమింగ్, అవుట్‌గోయింగ్ కాల్‌ల డేటాతో కూడి ఉంటుంది.\n\nమీరు ఇంతకు ముందెన్నడూ <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>కు కనెక్ట్ కాలేదు."</string>
+    <!-- no translation found for category_name_brightness (8520372392029305084) -->
+    <skip />
+    <!-- no translation found for category_name_lock_display (7478785189102882266) -->
+    <skip />
+    <!-- no translation found for category_name_visibility (4485030512199246405) -->
+    <skip />
+    <!-- no translation found for category_name_color (937514550918977151) -->
+    <skip />
+    <!-- no translation found for category_name_others (2366006298768550310) -->
+    <skip />
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index d9ebe44..3b533bb 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -233,8 +233,8 @@
     <item msgid="50701215019227883">"สั่น"</item>
     <item msgid="2690144000353492014">"อ่านรายชื่อติดต่อ"</item>
     <item msgid="3858029424955955625">"แก้ไขรายชื่อติดต่อ"</item>
-    <item msgid="3439658954936709507">"อ่านประวัติการโทร"</item>
-    <item msgid="1908944516631132130">"แก้ไขประวัติการโทร"</item>
+    <item msgid="3439658954936709507">"อ่านบันทึกการโทร"</item>
+    <item msgid="1908944516631132130">"แก้ไขบันทึกการโทร"</item>
     <item msgid="9066115715905100138">"อ่านปฏิทิน"</item>
     <item msgid="1664720478157892566">"แก้ไขปฏิทิน"</item>
     <item msgid="5478277451617814822">"ค้นหา WiFi"</item>
@@ -300,8 +300,8 @@
     <item msgid="4104617224667554750">"สั่น"</item>
     <item msgid="1623646715189708947">"อ่านรายชื่อติดต่อ"</item>
     <item msgid="5060760609109972207">"แก้ไขรายชื่อติดต่อ"</item>
-    <item msgid="7451260062940797278">"อ่านประวัติการโทร"</item>
-    <item msgid="2348589304974534308">"แก้ไขประวัติการโทร"</item>
+    <item msgid="7451260062940797278">"อ่านบันทึกการโทร"</item>
+    <item msgid="2348589304974534308">"แก้ไขบันทึกการโทร"</item>
     <item msgid="4089146706115315300">"อ่านปฏิทิน"</item>
     <item msgid="1305780729690198918">"แก้ไขปฏิทิน"</item>
     <item msgid="3461096740171440592">"ตำแหน่ง"</item>
@@ -495,7 +495,7 @@
   </string-array>
   <string-array name="wifi_metered_entries">
     <item msgid="3237321077949659241">"ตรวจหาโดยอัตโนมัติ"</item>
-    <item msgid="3779092145391320375">"ถือว่ามีการวัดปริมาณอินเทอร์เน็ต"</item>
+    <item msgid="3779092145391320375">"ถือว่ามีการจำกัดปริมาณอินเทอร์เน็ต"</item>
     <item msgid="2047166446768045816">"ถือว่าไม่มีการวัดปริมาณอินเทอร์เน็ต"</item>
   </string-array>
   <string-array name="wifi_privacy_entries">
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index a700379..ccdc814 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -312,8 +312,8 @@
     <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"อุปกรณ์ไม่ได้เข้ารหัส"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"หน้าจอล็อก"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"สิ่งที่จะแสดง"</string>
-    <string name="security_settings_summary" msgid="1627059516127354233">"ตั้งค่าตำแหน่งของฉัน ปลดล็อกหน้าจอ ล็อกซิมการ์ด ล็อกที่จัดเก็บข้อมูลรับรอง"</string>
-    <string name="cdma_security_settings_summary" msgid="2455517905101186330">"ตั้งค่าตำแหน่งของฉัน การปลดล็อกหน้าจอ การล็อกที่จัดเก็บข้อมูลรับรอง"</string>
+    <string name="security_settings_summary" msgid="1627059516127354233">"ตั้งค่าตำแหน่งของฉัน ปลดล็อกหน้าจอ ล็อกซิมการ์ด ล็อกที่เก็บข้อมูลเข้าสู่ระบบ"</string>
+    <string name="cdma_security_settings_summary" msgid="2455517905101186330">"ตั้งค่าตำแหน่งของฉัน การปลดล็อกหน้าจอ การล็อกที่เก็บข้อมูลเข้าสู่ระบบ"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"ความเป็นส่วนตัว"</string>
     <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"ไม่พร้อมใช้งาน"</string>
     <string name="security_status_title" msgid="6958004275337618656">"สถานะความปลอดภัย"</string>
@@ -557,7 +557,7 @@
     <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"ข้อมูลไบโอเมตริก + รหัสผ่าน"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"ดำเนินการต่อโดยไม่ใช้ข้อมูลไบโอเมตริก"</string>
     <string name="biometrics_unlock_title" msgid="7769374223959937435">"คุณปลดล็อกโทรศัพท์ได้โดยใช้ข้อมูลไบโอเมตริก ตัวเลือกนี้ต้องใช้การล็อกหน้าจอสำรองเพื่อความปลอดภัย"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"ปิดใช้โดยผู้ดูแลระบบ นโยบายการเข้ารหัสลับ หรือที่เก็บข้อมูลที่เชื่อถือได้"</string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"ปิดใช้โดยผู้ดูแลระบบ นโยบายการเข้ารหัสลับ หรือที่เก็บข้อมูลเข้าสู่ระบบ"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"ไม่มี"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"เลื่อน"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="1926480143883094896">"รูปแบบ"</string>
@@ -1062,7 +1062,7 @@
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"อุปกรณ์อื่นๆ สามารถเชื่อมต่อกับ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"รหัสผ่านฮอตสปอต"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"ย่านความถี่ AP"</string>
-    <string name="wifi_hotspot_footer_info_regular" msgid="6620216295510397461">"ใช้ฮอตสปอตเพื่อสร้างเครือข่าย Wi‑Fi สำหรับอุปกรณ์อื่นๆ ฮอตสปอตจะแชร์อินเทอร์เน็ตโดยใช้การเชื่อมต่อเน็ตมือถือ อาจมีค่าบริการเน็ตมือถือเพิ่มเติม"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="6620216295510397461">"ใช้ฮอตสปอตเพื่อสร้างเครือข่าย Wi‑Fi สำหรับอุปกรณ์อื่นๆ ฮอตสปอตจะแชร์อินเทอร์เน็ตโดยใช้การเชื่อมต่ออินเทอร์เน็ตมือถือ อาจมีค่าบริการอินเทอร์เน็ตมือถือเพิ่มเติม"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="3813311942370920903">"แอปสามารถสร้างฮอตสปอตเพื่อแชร์เนื้อหากับอุปกรณ์ที่อยู่ใกล้"</string>
     <string name="wifi_hotspot_auto_off_title" msgid="8855711787485504882">"ปิดฮอตสปอตโดยอัตโนมัติ"</string>
     <string name="wifi_hotspot_auto_off_summary" msgid="8283656069997871354">"เมื่อไม่มีอุปกรณ์ใดเชื่อมต่ออยู่"</string>
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"เวลาสิ้นสุด"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"สถานะ"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"ความเข้ม"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"ปิด / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"จะไม่เปิดโดยอัตโนมัติ"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"จะเปิดโดยอัตโนมัติในเวลา <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"จะเปิดโดยอัตโนมัติเมื่อพระอาทิตย์ตก"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"เปิด / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"จะไม่ปิดโดยอัตโนมัติ"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"จะปิดโดยอัตโนมัติในเวลา <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"จะปิดโดยอัตโนมัติเมื่อพระอาทิตย์ขึ้น"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"เปิดตั้งแต่พระอาทิตย์ตกจนขึ้น"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"เปิดในเวลาที่กำหนด"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"สถานะ"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"ปิด / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"จะไม่เปิดโดยอัตโนมัติ"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"จะเปิดโดยอัตโนมัติเมื่อพระอาทิตย์ตก"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"จะเปิดโดยอัตโนมัติในเวลา <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"เปิด/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"จะไม่ปิดโดยอัตโนมัติ"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"จะปิดโดยอัตโนมัติเมื่อพระอาทิตย์ขึ้น"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"จะปิดโดยอัตโนมัติในเวลา <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -1694,7 +1690,7 @@
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> จะถูกยกเลิกการปล่อยสัญญาณ"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"เชื่อมต่อผ่านอีเทอร์เน็ต"</string>
     <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"แชร์การเชื่อมต่ออินเทอร์เน็ตของโทรศัพท์ผ่านอีเทอร์เน็ต"</string>
-    <string name="tethering_footer_info" msgid="6782375845587483281">"ใช้ฮอตสปอตและการเชื่อมต่ออินเทอร์เน็ตผ่านมือถือ เพื่อให้อุปกรณ์อื่นๆ ใช้อินเทอร์เน็ตจากการเชื่อมต่อเน็ตมือถือได้ และแอปยังสามารถสร้างฮอตสปอตเพื่อแชร์เนื้อหากับอุปกรณ์ที่อยู่ใกล้เคียงได้อีกด้วย"</string>
+    <string name="tethering_footer_info" msgid="6782375845587483281">"ใช้ฮอตสปอตและการเชื่อมต่ออินเทอร์เน็ตผ่านมือถือเพื่อให้อุปกรณ์อื่นๆ ใช้อินเทอร์เน็ตจากการเชื่อมต่ออินเทอร์เน็ตมือถือได้ แอปยังสร้างฮอตสปอตเพื่อแชร์เนื้อหากับอุปกรณ์ที่อยู่ใกล้เคียงได้อีกด้วย"</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"ใช้ฮอตสปอตและการเชื่อมต่ออินเทอร์เน็ตผ่านมือถือเพื่อให้อุปกรณ์อื่นๆ ใช้อินเทอร์เน็ตจาก Wi-Fi หรือการเชื่อมต่ออินเทอร์เน็ตมือถือของคุณได้ แอปยังสร้างฮอตสปอตเพื่อแชร์เนื้อหากับอุปกรณ์ที่อยู่ใกล้เคียงได้อีกด้วย"</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"ความช่วยเหลือ"</string>
     <string name="network_settings_title" msgid="4663717899931613176">"เครือข่ายมือถือ"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"โปรแกรมอ่านหน้าจอ"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"เสียงและข้อความบนหน้าจอ"</string>
     <string name="display_category_title" msgid="6638191682294461408">"การแสดงผล"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"ส่วนควบคุมการโต้ตอบ"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"แอปที่ดาวน์โหลด"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"ทดสอบ"</string>
@@ -2457,7 +2455,7 @@
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"ใช้งานอุปกรณ์มากกว่าปกติ"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"แบตเตอรี่อาจหมดเร็วกว่าปกติ"</string>
     <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"การเพิ่มประสิทธิภาพแบตเตอรี่"</string>
-    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"การชาร์จแบตเตอรี่จำกัดชั่วคราว แตะเพื่อดูข้อมูลเพิ่มเติม"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"จำกัดแบตเตอรี่ไว้ชั่วคราว แตะเพื่อดูข้อมูลเพิ่มเติม"</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"มีการใช้งานโทรศัพท์มากกว่าปกติ แบตเตอรี่อาจหมดเร็วกว่าที่คาดไว้\n\nแอปที่ใช้แบตเตอรี่มากสุดมีลำดับดังนี้"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"มีการใช้งานแท็บเล็ตมากกว่าปกติ แบตเตอรี่อาจหมดเร็วกว่าที่คาดไว้\n\nแอปที่ใช้แบตเตอรี่มากสุดมีลำดับดังนี้"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"มีการใช้งานอุปกรณ์มากกว่าปกติ แบตเตอรี่อาจหมดเร็วกว่าที่คาดไว้\n\nแอปที่ใช้แบตเตอรี่มากสุดมีลำดับดังนี้"</string>
@@ -2712,8 +2710,8 @@
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"ติดตั้งแล้วสำหรับ VPN และแอป"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"ติดตั้งแล้วสำหรับ Wi-Fi"</string>
     <string name="credentials_reset_hint" msgid="4054601857203464867">"นำเนื้อหาทั้งหมดออกใช่ไหม"</string>
-    <string name="credentials_erased" msgid="9121052044566053345">"ที่จัดเก็บข้อมูลรับรองถูกลบ"</string>
-    <string name="credentials_not_erased" msgid="3611058412683184031">"ไม่สามารถลบที่เก็บข้อมูลรับรอง"</string>
+    <string name="credentials_erased" msgid="9121052044566053345">"ที่เก็บข้อมูลเข้าสู่ระบบถูกลบ"</string>
+    <string name="credentials_not_erased" msgid="3611058412683184031">"ลบที่เก็บข้อมูลเข้าระบบไม่ได้"</string>
     <string name="usage_access_title" msgid="1580006124578134850">"แอปที่มีสิทธิ์เข้าถึงการใช้งาน"</string>
     <string name="ca_certificate" msgid="3076484307693855611">"ใบรับรอง CA"</string>
     <string name="user_certificate" msgid="6897024598058566466">"ใบรับรองผู้ใช้ VPN และแอป"</string>
@@ -2796,7 +2794,7 @@
     <string name="work_mode_on_summary" msgid="2042885311126239961">"จัดการโดยองค์กร"</string>
     <string name="work_mode_off_summary" msgid="4044568753909036134">"แอปและการแจ้งเตือนปิดอยู่"</string>
     <string name="remove_managed_profile_label" msgid="1294933737673830431">"นำโปรไฟล์งานออก"</string>
-    <string name="background_data" msgid="321903213000101158">"ข้อมูลพื้นหลัง"</string>
+    <string name="background_data" msgid="321903213000101158">"อินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลัง"</string>
     <string name="background_data_summary" msgid="6572245922513522466">"แอปพลิเคชันสามารถซิงค์ ส่ง และรับข้อมูลได้ตลอดเวลา"</string>
     <string name="background_data_dialog_title" msgid="1692005302993229867">"ปิดอินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลัง"</string>
     <string name="background_data_dialog_message" msgid="7760280837612824670">"การปิดอินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลังจะทำให้แบตเตอรี่ใช้งานได้ยาวนานขึ้นและลดการใช้ข้อมูลลง แอปพลิเคชันบางอย่างอาจยังคงใช้การเชื่อมต่ออินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลังอยู่"</string>
@@ -2891,12 +2889,12 @@
     <string name="data_usage_forground_label" msgid="5762048187044975428">"พื้นหน้า:"</string>
     <string name="data_usage_background_label" msgid="5363718469293175279">"แบ็กกราวน์:"</string>
     <string name="data_usage_app_settings" msgid="5693524672522122485">"การตั้งค่าแอป"</string>
-    <string name="data_usage_app_restrict_background" msgid="5728840276368097276">"ข้อมูลพื้นหลัง"</string>
+    <string name="data_usage_app_restrict_background" msgid="5728840276368097276">"อินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลัง"</string>
     <string name="data_usage_app_restrict_background_summary" msgid="2997942775999602794">"เปิดใช้อินเทอร์เน็ตมือถือในเบื้องหลัง"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="8213268097024597864">"ก่อนอื่นให้ตั้งค่าขีดจำกัดในการใช้เน็ตมือถือก่อน เพื่อจำกัดอินเทอร์เน็ตที่แอปนี้ใช้งานอยู่เบื้องหลัง"</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="5383874438677899255">"ต้องการจำกัดอินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลังหรือไม่"</string>
     <string name="data_usage_app_restrict_dialog" msgid="5534272311979978297">"ฟีเจอร์นี้อาจทำให้แอปพลิเคชันที่ต้องอาศัยอินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลังหยุดทำงานเมื่อมีแต่เครือข่ายมือถือเท่านั้นที่ใช้งานได้\n\nคุณสามารถดูการควบคุมการใช้งานข้อมูลที่เหมาะสมกว่านี้ได้ในการตั้งค่าที่มีอยู่ภายในแอปพลิเคชัน"</string>
-    <string name="data_usage_restrict_denied_dialog" msgid="8599940395497268584">"คุณสามารถจำกัดอินเทอร์เน็ตในพื้นหลังได้เมื่อคุณได้ตั้งค่าขีดจำกัดอินเทอร์เน็ตมือถือไว้เท่านั้น"</string>
+    <string name="data_usage_restrict_denied_dialog" msgid="8599940395497268584">"คุณสามารถจำกัดอินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลังได้เมื่อคุณได้ตั้งค่าขีดจำกัดอินเทอร์เน็ตมือถือไว้เท่านั้น"</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2048411447974361181">"เปิดซิงค์ข้อมูลอัตโนมัติหรือไม่"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="6387714350903085918">"การเปลี่ยนแปลงใดๆ ที่คุณทำกับบัญชีของคุณบนเว็บจะมีการคัดลอกไปยังแท็บเล็ตโดยอัตโนมัติ\n\nบางบัญชีอาจคัดลอกการเปลี่ยนแปลงที่คุณทำบนแท็บเล็ตไปยังเว็บโดยอัตโนมัติ นี่คือการทำงานของบัญชี Google"</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="6457107552266187107">"การเปลี่ยนแปลงใดๆ ที่คุณทำกับบัญชีของคุณบนเว็บจะมีการคัดลอกไปยังโทรศัพท์โดยอัตโนมัติ\n\nบางบัญชีอาจคัดลอกการเปลี่ยนแปลงที่คุณทำบนโทรศัพท์ไปยังเว็บโดยอัตโนมัติ นี่คือการทำงานของบัญชี Google"</string>
@@ -2923,14 +2921,14 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="45300375132284265">"<xliff:g id="RANGE">%2$s</xliff:g>: ใช้แล้วประมาณ <xliff:g id="TOTAL">%1$s</xliff:g> ตามที่แท็บเล็ตวัดได้ ผู้ให้บริการอาจมีรายละเอียดการใช้ต่างจากนี้"</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="3183594094081558193">"<xliff:g id="RANGE">%2$s</xliff:g>: ใช้แล้วประมาณ <xliff:g id="TOTAL">%1$s</xliff:g> ตามที่โทรศัพท์วัดได้ ผู้ให้บริการอาจมีรายละเอียดการใช้ต่างจากนี้"</string>
     <string name="data_usage_metered_title" msgid="6421347352444253058">"ข้อจำกัดของเครือข่าย"</string>
-    <string name="data_usage_metered_body" msgid="1206840367501998582">"ระบบจะดำเนินการกับเครือข่ายที่มีการวัดปริมาณอินเทอร์เน็ตเหมือนกับเครือข่ายมือถือเมื่อมีการจำกัดอินเทอร์เน็ตในการทำงานเบื้องหลัง แอปอาจแจ้งเตือนคุณก่อนใช้เครือข่ายเหล่านี้เพื่อดาวน์โหลดไฟล์ขนาดใหญ่"</string>
+    <string name="data_usage_metered_body" msgid="1206840367501998582">"ระบบจะดำเนินการกับเครือข่ายแบบจำกัดปริมาณเหมือนกับเครือข่ายมือถือเมื่อมีการจำกัดอินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลัง แอปอาจแจ้งเตือนคุณก่อนใช้เครือข่ายเหล่านี้เพื่อดาวน์โหลดไฟล์ขนาดใหญ่"</string>
     <string name="data_usage_metered_mobile" msgid="3514227339274396401">"เครือข่ายมือถือ"</string>
-    <string name="data_usage_metered_wifi" msgid="4807465959110473407">"เครือข่าย Wi-Fi ที่วัดข้อมูล"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="4664158157415362613">"เปิด Wi‑Fi เพื่อเลือกเครือข่ายที่มีการวัดปริมาณข้อมูล"</string>
+    <string name="data_usage_metered_wifi" msgid="4807465959110473407">"เครือข่าย Wi-Fi แบบจำกัดปริมาณ"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="4664158157415362613">"เปิด Wi‑Fi เพื่อเลือกเครือข่ายแบบจำกัดปริมาณ"</string>
     <string name="data_usage_metered_auto" msgid="1560514082131687116">"อัตโนมัติ"</string>
     <string name="wifi_metered_title" msgid="6623732965268033931">"การใช้งานเครือข่าย"</string>
-    <string name="data_usage_metered_yes" msgid="4262598072030135223">"มีการวัดปริมาณอินเทอร์เน็ต"</string>
-    <string name="data_usage_metered_no" msgid="1685828958417926268">"ไม่มีการวัดปริมาณอินเทอร์เน็ต"</string>
+    <string name="data_usage_metered_yes" msgid="4262598072030135223">"แบบจำกัดปริมาณ"</string>
+    <string name="data_usage_metered_no" msgid="1685828958417926268">"ไม่มีการจำกัดปริมาณ"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"การทำบัญชีข้อมูลผู้ให้บริการอาจแตกต่างจากอุปกรณ์ของคุณ"</string>
     <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"หมายเลขฉุกเฉิน"</string>
     <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"กลับสู่การโทร"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"ลบผู้ใช้"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"ลบ"</string>
     <string name="user_guest" msgid="4545590092001460388">"ผู้ใช้ชั่วคราว"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"นำผู้เข้าร่วมออก"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"ต้องการนำผู้เข้าร่วมออกไหม"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"ล้างข้อมูลผู้มาเยือน"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"จบเซสชันผู้เยี่ยมชม"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"จบเซสชันผู้เยี่ยมชมใช่ไหม"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"ระบบจะลบแอปและข้อมูลทั้งหมดในเซสชันนี้"</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"นำออก"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"จบเซสชัน"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"เปิดการโทร"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"เปิดการโทรและ SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"ลบผู้ใช้"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"การสนทนาที่ไม่สำคัญ"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"การสนทนาที่คุณได้ทำการแก้ไข"</string>
     <string name="recent_conversations" msgid="471678228756995274">"การสนทนาล่าสุด"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"ล้างรายการล่าสุด"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"ล้างทุกรายการล่าสุด"</string>
     <string name="clear" msgid="5092178335409471100">"ล้าง"</string>
     <string name="important_bubble" msgid="7911698275408390846">"แสดงการสนทนาที่สำคัญเป็นบับเบิล"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"การสนทนาที่สำคัญจะแสดงที่ด้านบนของหน้าต่างแจ้งเตือนแบบดึงลง และคุณยังตั้งค่าให้แสดงเป็นบับเบิลและข้ามโหมดห้ามรบกวนได้ด้วย"</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"เชื่อมต่อหลายอุปกรณ์แล้ว"</string>
     <string name="demo_mode" msgid="6566167465451386728">"โหมดสาธิต UI ของระบบ"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"ธีมมืด"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"เปิด / ปิดใช้ชั่วคราวเนื่องจากอยู่ในโหมดประหยัดแบตเตอรี่"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"เปิดชั่วคราวเนื่องจากอยู่ในโหมดประหยัดแบตเตอรี่"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"แอปที่รองรับจะเปลี่ยนเป็นธีมมืดด้วย"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"ได้เลย"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ค่ากำหนด"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"เชื่อมต่อเครือข่ายสาธารณะ"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"การเชื่อมต่อเครือข่าย, อินเทอร์เน็ต, ไร้สาย, อินเทอร์เน็ตมือถือ, wifi, wi-fi, wi fi, เครือข่ายมือถือ, อุปกรณ์เคลื่อนที่, ผู้ให้บริการเครือข่ายมือถือ, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"ดูเครือข่ายที่ใช้บนเครื่องบินได้ปลอดภัย"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"ปิดโหมดบนเครื่องบิน"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"ดูเครือข่ายที่ใช้โหมดบนเครื่องบินได้"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"ปิดโหมดบนเครื่องบิน"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"เชื่อมต่อแล้ว"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"จะไม่มีการเชื่อมต่ออินเทอร์เน็ตโดยอัตโนมัติ"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"ไม่มีเครือข่ายอื่นๆ ที่พร้อมใช้งาน"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"ไม่มีเครือข่ายที่พร้อมใช้งาน"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"ใช้ไม่ได้เนื่องจากโหมดเวลาเข้านอนเปิดอยู่"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"รีเซ็ตความสำคัญในการแจ้งเตือนแล้ว"</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"แอป"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"อุปกรณ์ที่ไม่น่าเชื่อถือต้องการเข้าถึงข้อความของคุณ แตะเพื่อดูรายละเอียด"</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"อนุญาตให้เข้าถึงข้อความไหม"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"อุปกรณ์บลูทูธที่ไม่น่าเชื่อถือ [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] ต้องการเข้าถึงข้อความของคุณ\n\nคุณไม่เคยเชื่อมต่อกับ [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] มาก่อน"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"อุปกรณ์บลูทูธ <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ที่ไม่น่าเชื่อถือต้องการเข้าถึงข้อความของคุณ\n\nคุณไม่เคยเชื่อมต่อกับ <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> มาก่อน"</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"อุปกรณ์ที่ไม่น่าเชื่อถือต้องการเข้าถึงรายชื่อติดต่อและบันทึกการโทร แตะเพื่อดูรายละเอียด"</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"อนุญาตให้เข้าถึงรายชื่อติดต่อและบันทึกการโทรไหม"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"อุปกรณ์บลูทูธที่ไม่น่าเชื่อถือ [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] ต้องการเข้าถึงรายชื่อติดต่อและบันทึกการโทร ซึ่งรวมถึงข้อมูลเกี่ยวกับสายเรียกเข้าและโทรออก\n\nคุณไม่เคยเชื่อมต่อกับ [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] มาก่อน"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"อุปกรณ์บลูทูธ <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ที่ไม่น่าเชื่อถือต้องการเข้าถึงรายชื่อติดต่อและบันทึกการโทร ซึ่งรวมถึงข้อมูลเกี่ยวกับสายเรียกเข้าและโทรออก\n\nคุณไม่เคยเชื่อมต่อกับ <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> มาก่อน"</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"ความสว่าง"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"หน้าจอล็อก"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"การเปิดเผย"</string>
+    <string name="category_name_color" msgid="937514550918977151">"สี"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"อื่นๆ"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 5f47977..faf8f0b 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Oras ng pagtatapos"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Status"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intensity"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Naka-off / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Hindi awtomatikong mag-o-on kailanman"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Awtomatikong mag-o-on nang <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Awtomatikong mag-o-on sa sunset"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Naka-on / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Hindi awtomatikong mag-o-off kailanman"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Awtomatikong mag-o-off nang <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Awtomatikong mag-o-off sa sunrise"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Ma-on sa sunset hanggang sunrise"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Ino-on sa custom na oras"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Status"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Naka-off / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Hindi awtomatikong mag-o-on kailanman"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Awtomatikong mao-on sa sunset"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Awtomatikong mag-o-on nang <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Naka-on / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Hindi awtomatikong mao-off kailanman"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Awtomatikong mao-off sa sunrise"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Awtomatikong mag-o-off nang <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Mga screen reader"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio at text sa screen"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Display"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Mga kontrol ng pakikipag-ugnayan"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Mga na-download na app"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Pang-eksperimento"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"I-delete ang user"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"I-delete"</string>
     <string name="user_guest" msgid="4545590092001460388">"Bisita"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Alisin ang bisita"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Alisin ang bisita?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"I-clear ang data ng bisita"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Tapusin ang session ng bisita"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Tapusin ang session ng bisita?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Ide-delete ang lahat ng app at data sa session na ito."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Alisin"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Tapusin ang session"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"I-on ang mga pagtawag sa telepono"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"I-on ang mga pagtawag sa telepono at SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"I-delete ang user"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Mga hindi priyoridad na pag-uusap"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Mga pag-uusap na ginawan mo ng mga pagbabago"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Mga kamakailang pag-uusap"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"I-clear ang recents"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"I-clear lahat ng bago"</string>
     <string name="clear" msgid="5092178335409471100">"I-clear"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Mga bubble ng mga priyoridad na pag-uusap"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Lalabas ang mga priyoridad na pag-uusap sa itaas ng pull-down shade. Puwede mo ring itakda ang mga ito na maging bubble at gambalain ang Huwag Istorbohin."</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Nakakonekta sa maraming device"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Demo mode ng System UI"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Madilim na tema"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"On / Pansamantalang na-disable dahil sa Pantipid ng Baterya"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Pansamantalang na-on dahil sa Pantipid ng Baterya"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Lilipat din sa madilim na tema ang mga sinusuportahang app"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"OK"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Mga Kagustuhan"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Kumonekta sa mga pampublikong network"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"koneksyon ng network, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, cell carrier, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Tingnan ang mga airplane-safe na network"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"I-off ang Airplane Mode"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Tingnan ang mga network sa airplane mode"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"I-off ang airplane mode"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Nakakonekta"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Hindi awtomatikong kokonekta ang Internet"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Walang available na iba pang network"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Walang available na network"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Hindi available dahil naka-on ang bedtime mode"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Tapos na ang pag-reset sa kahalagahan ng notification."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Mga App"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Gustong i-access ng hindi pinagkakatiwalaang device ang iyong mga mensahe. I-tap para sa mga detalye."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Payagan ang access sa mga mensahe?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Gustong i-access ng hindi pinagkakatiwalaang Bluetooth device, ang [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ang iyong mensahe.\n\nHindi ka pa nakakakonekta dati sa [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Gustong i-access ng hindi pinagkakatiwalaang Bluetooth device, ang <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, ang iyong mga mensahe.\n\nHindi ka pa nakakakonekta dati sa <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Gustong i-access ng hindi pinagkakatiwalaang device ang iyong mga contact at log ng tawag. I-tap para sa mga detalye."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Payagan ang access sa mga contact at log ng tawag?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Gustong i-access ng hindi pinagkakatiwalaang Bluetooth device, ang [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ang iyong mga contact at log ng tawag. Kasama rito ang data tungkol sa mga papasok at papalabas na tawag.\n\nHindi ka pa nakakakonekta dati sa [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Gustong i-access ng hindi pinagkakatiwalaang Bluetooth device, ang <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, ang iyong mga contact at log ng tawag. Kasama rito ang data tungkol sa mga papasok at papalabas na tawag.\n\nHindi ka pa nakakakonekta dati sa <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Liwanag"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Display ng Lock"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Visibility"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Kulay"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Iba pa"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 5eb6356..94cbf86 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Bitiş zamanı"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Durum"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Yoğunluk"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Kapalı / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"hiçbir zaman otomatik olarak açılmayacak"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Şu saatte otomatik olarak açılacak: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Güneş battığında otomatik olarak açılacak"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Açık / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"hiçbir zaman otomatik olarak kapatılmayacak"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Şu saatte otomatik olarak kapatılacak: <xliff:g id="ID_1">%1$s</xliff:g>."</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Güneş doğduğunda otomatik olarak kapatılacak"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Güneşin batışından doğuşuna kadar açık kalır"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Belirlenen saatte açılır"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Durum"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Kapalı / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"hiçbir zaman otomatik olarak açılmayacak"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Güneş battığında otomatik olarak açılacak"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Şu saatte otomatik olarak açılacak: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Açık / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"hiçbir zaman otomatik olarak kapatılmayacak"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Güneş doğduğunda otomatik olarak kapatılacak"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Şu saatte otomatik olarak kapatılacak: <xliff:g id="ID_1">%1$s</xliff:g>."</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Ekran okuyucular"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Ses ve ekran metni"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Ekran"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Etkileşim denetimleri"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"İndirilen uygulamalar"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Deneysel"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Kullanıcıyı sil"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Sil"</string>
     <string name="user_guest" msgid="4545590092001460388">"Misafir"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Misafir oturumunu kaldır"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Misafir oturumu kaldırılsın mı?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Misafir verilerini sil"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Misafir oturumunu sonlandır"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Misafir oturumu sonlandırılsın mı?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Bu oturumdaki tüm uygulamalar ve veriler silinecek."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Kaldır"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Oturumu sonlandır"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Telefon çağrılarını aç"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Telefon çağrılarını ve SMS\'i aç"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Kullanıcıyı sil"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Öncelikli olmayan görüşmeler"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Değişiklik yaptığınız görüşmeler"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Son görüşmeler"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Son görüşmeleri sil"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Son öğelerin tümünü sil"</string>
     <string name="clear" msgid="5092178335409471100">"Sil"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Öncelikli görüşmeleri balon olarak göster"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Öncelikli görüşmeler aşağı indirilen gölgenin üst kısmında gösterilir. Bunları ayrıca baloncuk olarak gösterilecek ve Rahatsız Etmeyin özelliğini dikkate almayacak şekilde ayarlayabilirsiniz."</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Birden çok cihaza bağlı"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Sistem Kullanıcı Arayüzü demo modu"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Koyu tema"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Açık / Pil Tasarrufu nedeniyle geçici olarak devre dışı bırakıldı"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Pil Tasarrufu nedeniyle geçici olarak açıldı"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Desteklenen uygulamalar koyu temaya da geçiş yapar"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Anladım"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Tercihler"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Herkese açık ağlara bağlan"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ağ bağlantısı, internet, kablosuz, veri, wifi, wi-fi, wi fi, hücresel, mobil, hücresel operatör, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Uçakta kullanımı güvenli ağları göster"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Uçak Modu\'nu kapat"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Uçak modu ağlarını göster"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Uçak modunu kapat"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Bağlı"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"İnternet otomatik olarak bağlanmaz"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Kullanılabilir başka ağ yok"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Kullanılabilir ağ yok"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Uyku vakti modu açık olduğundan kullanılamıyor"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Bildirimlerin önemini sıfırlama işlemi tamamlandı."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Uygulamalar"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Güvenilmeyen bir cihaz mesajlarınıza erişmek istiyor. Ayrıntılar için dokunun."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Mesajlara erişime izin verilsin mi?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Güvenilmeyen bir Bluetooth cihazı [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] mesajlarınıza erişmek istiyor.\n\n[<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] adlı cihaza daha önce bağlanmadınız."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Güvenilmeyen bir Bluetooth cihaz, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, mesajlarınıza erişmek istiyor.\n\n<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> adlı cihaza daha önce bağlanmadınız."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Güvenilmeyen bir cihaz kişilerinize ve arama kaydınıza erişmek istiyor. Ayrıntılar için dokunun."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Kişilerinize ve arama kaydınıza erişime izin verilsin mi?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Güvenilmeyen bir Bluetooth cihazı [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] kişilerinize ve arama kaydınıza erişmek istiyor. Bu hem gelen hem giden aramalarınıza ait verileri içerir.\n\n [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] adlı cihaza daha önce bağlanmadınız."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Güvenilmeyen bir Bluetooth cihaz, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, kişilerinize ve arama kaydınıza erişmek istiyor. Bu hem gelen hem giden aramalarınıza ait verileri içerir.\n\n<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> adlı cihaza daha önce bağlanmadınız."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Parlaklık"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Kilit Ekranı"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Görünürlük"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Renk"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Diğer"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 280bf91..dbd4d28 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1269,11 +1269,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Час завершення"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Статус"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Інтенсивність"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Вимкнено / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Не ввімкнеться автоматично"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Вмикатиметься автоматично о <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Вмикатиметься автоматично після заходу сонця"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Увімкнено / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Ніколи не вимикатиметься автоматично"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Вимикатиметься автоматично о <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Вимикатиметься автоматично на світанку"</string>
@@ -1296,11 +1294,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Від заходу до світанку"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Вмикається у вибраний час"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Статус"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Вимкнено / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Не ввімкнеться автоматично"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Увімкнеться автоматично після заходу сонця"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Вмикатиметься автоматично о <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Увімкнено / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Не вимкнеться автоматично"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Вимкнеться автоматично на світанку"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Вимикатиметься автоматично о <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2184,6 +2180,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Програми зчитування з екрана"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Аудіо й текст на екрані"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Екран"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Елементи керування взаємодією"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Завантажені додатки"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Експериментальні налаштування"</string>
@@ -3161,10 +3159,15 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Видалити користувача"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Видалити"</string>
     <string name="user_guest" msgid="4545590092001460388">"Гість"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Вийти з режиму гостя"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Вийти з режиму гостя?"</string>
+    <!-- no translation found for user_clear_guest_menu (4864362688187480452) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_menu (5064400453222497734) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_confirm_title (7526978959527761497) -->
+    <skip />
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Усі додатки й дані з цього сеансу буде видалено."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Вийти"</string>
+    <!-- no translation found for user_exit_guest_dialog_remove (8095094235815676847) -->
+    <skip />
     <string name="user_enable_calling" msgid="264875360626905535">"Увімкнути телефонні дзвінки"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Увімкнути телефонні дзвінки й SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Видалити користувача"</string>
@@ -3681,7 +3684,8 @@
     <string name="other_conversations" msgid="551178916855139870">"Непріоритетні розмови"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Розмови, у які ви вносили зміни"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Нещодавні розмови"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Очистити нещодавні"</string>
+    <!-- no translation found for conversation_settings_clear_recents (4246342656145488662) -->
+    <skip />
     <string name="clear" msgid="5092178335409471100">"Очистити"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Показувати важливі чати в спливаючих сповіщеннях"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Важливі чати показуються у верхній частині розкривної панелі. Ви можете налаштувати надсилання спливаючих сповіщень про них, навіть коли ввімкнено режим \"Не турбувати\"."</string>
@@ -4564,7 +4568,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Під’єднано до кількох пристроїв"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Демо-режим інтерфейсу системи"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Темна тема"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Ввімкнено/тимчасово вимкнено через режим енергозбереження"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Тимчасово ввімкнено через режим енергозбереження"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"У підтримуваних додатках також увімкнеться темна тема"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"OK"</string>
@@ -5229,15 +5234,34 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Параметри"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Підключатися до загальнодоступних мереж"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"з\'єднання з мережею, Інтернет, бездротове, дані, Wi-Fi, wi-fi, wi fi, мобільний, стільниковий, оператор мобільного зв\'язку, 4G, 3G, 2G, LTE"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Показати безпечні в літаку мережі"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Вимкнути режим польоту"</string>
+    <!-- no translation found for view_airplane_safe_networks (9170023210981508906) -->
+    <skip />
+    <!-- no translation found for turn_off_airplane_mode (7141986366534514443) -->
+    <skip />
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Підключено"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Автоматичне інтернет-з\'єднання вимкнено"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Інші мережі недоступні"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Немає доступних мереж"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Недоступно в нічному режимі"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Пріоритет сповіщень скинуто."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Додатки"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Ненадійний пристрій хоче отримати доступ до ваших повідомлень. Натисніть, щоб дізнатися більше."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Дозволити доступ до повідомлень?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Ненадійний пристрій із Bluetooth [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] хоче отримати доступ до ваших повідомлень.\n\nВи ще не підключалися до пристрою [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Недовірений пристрій із Bluetooth (<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>) хоче отримати доступ до ваших повідомлень.\n\nВи ще не підключалися до пристрою <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Ненадійний пристрій хоче отримати доступ до ваших контактів і журналу викликів. Натисніть, щоб дізнатися більше."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Дозволити доступ до контактів і журналу викликів?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Ненадійний пристрій із Bluetooth [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] хоче отримати доступ до ваших контактів і журналу викликів, зокрема даних про вхідні й вихідні виклики.\n\nВи ще не підключалися до пристрою [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Недовірений пристрій із Bluetooth (<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>) хоче отримати доступ до ваших контактів і журналу викликів, зокрема даних про вхідні й вихідні виклики.\n\nВи ще не підключалися до пристрою <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
+    <!-- no translation found for category_name_brightness (8520372392029305084) -->
+    <skip />
+    <!-- no translation found for category_name_lock_display (7478785189102882266) -->
+    <skip />
+    <!-- no translation found for category_name_visibility (4485030512199246405) -->
+    <skip />
+    <!-- no translation found for category_name_color (937514550918977151) -->
+    <skip />
+    <!-- no translation found for category_name_others (2366006298768550310) -->
+    <skip />
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 77318ba..92938bc 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -544,7 +544,7 @@
     <string name="current_screen_lock" msgid="1367883977261098017">"موجودہ اسکرین لاک"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4492334416059646032">"فنگر پرنٹ + پیٹرن"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"‏فنگر پرنٹ + PIN"</string>
-    <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"فنگر پرنٹ + پاسورڈ"</string>
+    <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"فنگر پرنٹ + پاس ورڈ"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"فنگر پرنٹ کے بغیر جاری رکھیں"</string>
     <string name="fingerprint_unlock_title" msgid="4978686534505944042">"آپ اپنے فون کو اپنا فنگر پرنٹ استعمال کر کے غیر مقفل کر سکتے ہیں۔ سیکیورٹی کیلئے، اس اختیار کو ایک بیک اپ اسکرین قفل درکار ہے۔"</string>
     <string name="face_unlock_set_unlock_pattern" msgid="5991691559532427891">"چہرے کے ذریعے غیر مقفل کرنا + پیٹرن"</string>
@@ -591,8 +591,8 @@
     <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="6844729803535310058">"‏پروفائل کے تحفظ کی خصوصیات آپ کے PIN کے بغیر کام نہیں کریں گی۔<xliff:g id="EMPTY_LINE">
 
 </xliff:g>آپ کے محفوظ کردہ فنگر پرنٹس بھی اس پروفائل سے ہٹا دیے جائیں گے اور آپ ان سے اپنے پروفائل کو غیر مقفل، خریداریوں کی اجازت یا ایپس میں سائن ان نہیں کر پائیں گے۔"</string>
-    <string name="unlock_disable_frp_warning_content_password_profile" msgid="6922335143823758149">"پروفائل کے تحفظ کی خصوصیات آپ کے پاسورڈ کے بغیر کام نہیں کریں گی۔"</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="5724824564583660260">"پروفائل کے تحفظ کی خصوصیات آپ کے پاسورڈ کے بغیر کام نہیں کریں گی۔<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_profile" msgid="6922335143823758149">"پروفائل کے تحفظ کی خصوصیات آپ کے پاس ورڈ کے بغیر کام نہیں کریں گی۔"</string>
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="5724824564583660260">"پروفائل کے تحفظ کی خصوصیات آپ کے پاس ورڈ کے بغیر کام نہیں کریں گی۔<xliff:g id="EMPTY_LINE">
 
 </xliff:g>آپ کے محفوظ کردہ فنگر پرنٹس بھی اس پروفائل سے ہٹا دیے جائیں گے اور آپ ان سے اپنے پروفائل کو غیر مقفل، خریداریوں کی اجازت یا ایپس میں سائن ان نہیں کر پائیں گے۔"</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6886183964362015704">"پروفائل کے تحفظ کی خصوصیات آپ کے اسکرین قفل کے بغیر کام نہیں کریں گی۔"</string>
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"وقت اختتام"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"اسٹیٹس"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"شدت"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"آف / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"کبھی بھی خودکار طور پر آن نہیں ہو گی"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"<xliff:g id="ID_1">%1$s</xliff:g> پر خودکار طور پر آن ہو جائے گا"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"غروب آفتاب پر خودکار طور پر آن ہو جائے گا"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"آن / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"کبھی بھی خودکار طور پر آف نہیں ہوگا"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"<xliff:g id="ID_1">%1$s</xliff:g> پر خودکار طور پر آف ہو جائے گا"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"طلوع آفتاب پر خودکار طور پر آف ہو جائے گا"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"شام سے صبح تک کے ليے آن ہوتی ہے"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"حسب ضرورت وقت پر آن ہوتی ہے"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"صورتحال"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"آف / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"کبھی بھی خودکار طور پر آن نہیں ہو گی"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"غروب آفتاب پر خودکار طور پر آن ہو جائے گی"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"<xliff:g id="ID_1">%1$s</xliff:g> پر خودکار طور پر آن ہو جائے گا"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"آن / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"کبھی بھی خودکار طور پر آف نہیں ہو گی"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"طلوع آفتاب پر خودکار طور پر آف ہو جائے گی"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"<xliff:g id="ID_1">%1$s</xliff:g> پر خودکار طور پر آف ہو جائے گا"</string>
@@ -1785,8 +1781,8 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="6571695168138207587">"‏آپ کے پاس ڈيٹا کنکشن نہيں ہے۔ اس معلومات کو ابھی دیکھنے کیلئے، انٹرنیٹ سے مربوط کسی بھی کمپیوٹر سے ‎%s پر جائیں۔"</string>
     <string name="settings_safetylegal_activity_loading" msgid="1757860124583063395">"لوڈ ہو رہا ہے…"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="7587198092214670356">"اسکرین لاک سیٹ کریں"</string>
-    <string name="lockpassword_choose_your_password_message" msgid="4474728476383676731">"سیکیورٹی کیلئے، پاسورڈ سیٹ کریں"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="3167261267229254090">"فنگر پرنٹ کے استعمال کے لیے پاسورڈ سیٹ کریں"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="4474728476383676731">"سیکیورٹی کیلئے، پاس ورڈ سیٹ کریں"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="3167261267229254090">"فنگر پرنٹ کے استعمال کے لیے پاس ورڈ سیٹ کریں"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="4707788269512303400">"فنگر پرنٹ کے استعمال کے لیے پیٹرن سیٹ کریں"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="7230665212172041837">"‏سیکیورٹی کیلئے، PIN سیٹ کریں"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"‏فنگر پرنٹ کے استعمال کے لیے PIN سیٹ کریں"</string>
@@ -1815,10 +1811,10 @@
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"‏اپنا PIN بھول گئے؟"</string>
     <string name="lockpassword_confirm_your_pattern_generic" msgid="7692794426682501482">"جاری رکھنے کیلئے اپنے آلہ کا پیٹرن استعمال کریں"</string>
     <string name="lockpassword_confirm_your_pin_generic" msgid="9206928587904701094">"‏جاری رکھنے کیلئے اپنے آلہ کا PIN درج کریں"</string>
-    <string name="lockpassword_confirm_your_password_generic" msgid="2616127423884477152">"جاری رکھنے کیلئے اپنے آلہ کا پاسورڈ درج کریں"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="2616127423884477152">"جاری رکھنے کیلئے اپنے آلہ کا پاس ورڈ درج کریں"</string>
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="9110305410672321714">"جاری رکھنے کیلئے اپنا دفتری پیٹرن استعمال کریں"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="6524208128570235127">"‏جاری رکھنے کیلئے اپنا دفتری PIN درج کریں"</string>
-    <string name="lockpassword_confirm_your_password_generic_profile" msgid="5918738487760814147">"جاری رکھنے کیلئے اپنا دفتری پاسورڈ درج کریں"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="5918738487760814147">"جاری رکھنے کیلئے اپنا دفتری پاس ورڈ درج کریں"</string>
     <string name="lockpassword_strong_auth_required_device_pattern" msgid="113817518413715557">"اضافی سیکیورٹی کیلئے اپنے آلہ کا پیٹرن استعمال کریں"</string>
     <string name="lockpassword_strong_auth_required_device_pin" msgid="9163822166411129815">"‏اضافی سیکیورٹی کیلئے اپنے آلہ کا PIN درج کریں"</string>
     <string name="lockpassword_strong_auth_required_device_password" msgid="8310047427464299337">"اضافی سیکیورٹی کیلئے، اپنے آلہ کا پاس ورڈ درج کریں"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"اسکرین ریڈرز"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"آڈیو اور اسکرین پر موجود ٹیکسٹ"</string>
     <string name="display_category_title" msgid="6638191682294461408">"ڈسپلے"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"تعامل کنٹرولز"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"ڈاؤن لوڈ کردہ ایپس"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"تجرباتی"</string>
@@ -3075,10 +3073,15 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"صارف کو حذف کریں"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"حذف کریں"</string>
     <string name="user_guest" msgid="4545590092001460388">"مہمان"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"مہمان کو ہٹائیں"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"مہمان کو ہٹائیں؟"</string>
+    <!-- no translation found for user_clear_guest_menu (4864362688187480452) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_menu (5064400453222497734) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_confirm_title (7526978959527761497) -->
+    <skip />
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"اس سیشن میں موجود سبھی ایپس اور ڈیٹا کو حذف کر دیا جائے گا۔"</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"ہٹائیں"</string>
+    <!-- no translation found for user_exit_guest_dialog_remove (8095094235815676847) -->
+    <skip />
     <string name="user_enable_calling" msgid="264875360626905535">"فون کالز آن کریں"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"‏فون کالز اور SMS آن کریں"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"صارف کو حذف کریں"</string>
@@ -3591,7 +3594,8 @@
     <string name="other_conversations" msgid="551178916855139870">"غیر ترجیحی گفتگوئیں"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"گفتگوئیں جن میں آپ نے تبدیلیاں کی ہیں"</string>
     <string name="recent_conversations" msgid="471678228756995274">"حالیہ گفتگوئیں"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"حالیہ کو صاف کریں"</string>
+    <!-- no translation found for conversation_settings_clear_recents (4246342656145488662) -->
+    <skip />
     <string name="clear" msgid="5092178335409471100">"صاف کریں"</string>
     <string name="important_bubble" msgid="7911698275408390846">"بلبلہ ترجیحی گفتگوئیں"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"ترجیحی گفتگوئیں پُل ڈاؤن شیڈ کے اوپری حصے میں دکھائی دیتی ہیں۔ آپ انہیں بلبلہ اور \'ڈسٹرب نہ کریں\' مداخلت پر بھی سیٹ کر سکتے ہیں۔"</string>
@@ -3909,7 +3913,7 @@
     <string name="encryption_continue_button" msgid="3591796237625134622">"جاری رکھیں"</string>
     <string name="encryption_interstitial_message_pin" msgid="1413575143234269985">"‏آپ یہ آلہ شروع ہونے سے پہلے اپنے PIN کا تقاضہ کر کے، اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا ہے۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔ آپ کا آلہ شروع کرنے سے پہلے PIN طلب کریں؟"</string>
     <string name="encryption_interstitial_message_pattern" msgid="726550613252236854">"آپ یہ آلہ شروع ہونے سے پہلے اپنے پیٹرن کا تقاضہ کر کے، اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا ہے۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔ آپ کا آلہ شروع کرنے سے پہلے پیٹرن طلب کریں؟"</string>
-    <string name="encryption_interstitial_message_password" msgid="6051054565294909975">"آپ یہ آلہ شروع ہونے سے پہلے اپنے پاسورڈ کا تقاضہ کر کے، اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا ہے۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔ آپ کا آلہ شروع کرنے سے پہلے پاسورڈ طلب کریں؟"</string>
+    <string name="encryption_interstitial_message_password" msgid="6051054565294909975">"آپ یہ آلہ شروع ہونے سے پہلے اپنے پاس ورڈ کا تقاضہ کر کے، اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا ہے۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔ آپ کا آلہ شروع کرنے سے پہلے پاس ورڈ طلب کریں؟"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="7152770518093102916">"‏اپنے آلہ کو غیر مقفل کرنے کیلئے اپنی فنگر پرنٹ استعمال کرنے کے علاوہ، آپ یہ آلہ شروع ہونے سے پہلے اپنے PIN کا تقاضہ کر کے اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔ آپ کا آلہ شروع ہونے سے پہلے PIN طلب کریں؟"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="6257856552043740490">"اپنے آلہ کو غیر مقفل کرنے کیلئے اپنی فنگر پرنٹ استعمال کرنے کے علاوہ، آپ یہ آلہ شروع ہونے سے پہلے اپنے پیٹرن کا تقاضہ کر کے اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔ آپ کا آلہ شروع کرنے سے پہلے پیٹرن طلب کریں؟"</string>
     <string name="encryption_interstitial_message_password_for_fingerprint" msgid="7710804822643612867">"اپنے آلہ کو غیر مقفل کرنے کیلئے اپنی فنگر پرنٹ استعمال کرنے کے علاوہ، آپ یہ آلہ شروع ہونے سے پہلے اپنے پاس ورڈ کا تقاضہ کر کے اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔ آپ کا آلہ شروع ہونے سے پہلے پاس ورڈ طلب کریں؟"</string>
@@ -4354,7 +4358,7 @@
     <string name="lockpattern_settings_require_cred_before_startup" msgid="4098653943835666086">"محفوظ آغاز"</string>
     <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="311325321794497404">"آپ کا آلہ چالو کرنے کیلئے پیٹرن درکار ہے۔ آف ہوتے ہوئے یہ آلہ کالز، پیٖغامات، اطلاعات یا الارمز موصول نہیں کر سکتا۔"</string>
     <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="1881271630312222251">"‏آپ کا آلہ چالو کرنے کیلئے PIN درکار ہے۔ آف ہوتے ہوئے یہ آلہ کالز، پیٖغامات، اطلاعات یا الارمز موصول نہیں کر سکتا۔"</string>
-    <string name="lockpattern_settings_require_password_before_startup_summary" msgid="8651761245246411947">"آپ کا آلہ چالو کرنے کیلئے پاسورڈ درکار ہے۔ آف ہوتے ہوئے یہ آلہ کالز، پیٖغامات، اطلاعات یا الارمز موصول نہیں کر سکتا۔"</string>
+    <string name="lockpattern_settings_require_password_before_startup_summary" msgid="8651761245246411947">"آپ کا آلہ چالو کرنے کیلئے پاس ورڈ درکار ہے۔ آف ہوتے ہوئے یہ آلہ کالز، پیٖغامات، اطلاعات یا الارمز موصول نہیں کر سکتا۔"</string>
     <string name="suggestion_additional_fingerprints" msgid="4726777300101156208">"ایک اور فنگر پرنٹ شامل کریں"</string>
     <string name="suggestion_additional_fingerprints_summary" msgid="2825364645039666674">"مختلف انگلی سے غیر مقفل کریں"</string>
     <string name="battery_saver_on_summary" msgid="4605146593966255848">"آن"</string>
@@ -4424,7 +4428,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"متعدد آلات سے منسلک کردہ"</string>
     <string name="demo_mode" msgid="6566167465451386728">"‏سسٹم UI ڈیمو موڈ"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"گہری تھیم"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"آن / بیٹری سیور کی وجہ سے عارضی طور پر غیر فعال ہے"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"بیٹری سیور کی وجہ سے عارضی طور پر آن ہے"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"تعاون یافتہ ایپس بھی گہری تھیم پر سوئچ ہو جائیں گی"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"سمجھ آ گئی"</string>
@@ -5063,15 +5068,39 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ترجیحات"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"عوامی نیٹ ورکس سے منسلک ہوں"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"‏نیٹ ورک کنکشن، انٹرنیٹ، وائرلیس، ڈیٹا، wifi، wi-fi، wi fi، سیلولر، موبائل، سیل کیریئر، 4g، 3g، 2g، ‏lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"ہوائی جہاز کے لیے محفوظ نیٹ ورکس دیکھیں"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"ہوائی جہاز وضع آف کریں"</string>
+    <!-- no translation found for view_airplane_safe_networks (9170023210981508906) -->
+    <skip />
+    <!-- no translation found for turn_off_airplane_mode (7141986366534514443) -->
+    <skip />
+    <!-- no translation found for preference_summary_default_combination (4643585915107796253) -->
+    <skip />
+    <!-- no translation found for mobile_data_connection_active (2422223108911581552) -->
+    <skip />
+    <!-- no translation found for mobile_data_off_summary (3841411571485837651) -->
+    <skip />
+    <!-- no translation found for non_carrier_network_unavailable (9031567407964127997) -->
+    <skip />
+    <!-- no translation found for all_network_unavailable (1163897808282057496) -->
+    <skip />
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"دستیاب نہیں ہے کیونکہ بیڈ ٹائم موڈ آن ہے"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"اطلاع کی اہمیت کو ری سیٹ کرنے کا عمل مکمل ہو گیا۔"</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"ایپس"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"غیر بھروسہ مند آلہ آپ کے پیغامات تک رسائی حاصل کرنا چاہتا ہے۔ تفصیلات کے ليے تھپتھپائيں۔"</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"پیغامات تک رسائی کی اجازت دیں؟"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"ایک غیر بھروسہ مند بلوٹوتھ آلہ، [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]، آپ کے پیغامات تک رسائی حاصل کرنا چاہتا ہے۔\n\nآپ پہلے کبھی بھی [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] سے منسلک نہیں ہوئے ہیں۔"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"ایک غیر بھروسہ مند بلوٹوتھ آلہ، <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>، آپ کے پیغامات تک رسائی حاصل کرنا چاہتا ہے۔\n\nآپ پہلے کبھی بھی <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> سے منسلک نہیں ہوئے ہیں۔"</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"غیر بھروسہ مند آلہ آپ کے رابطوں اور کال لاگ تک رسائی حاصل کرنا چاہتا ہے۔ تفصیلات کے ليے تھپتھپائيں۔"</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"رابطوں اور کال لاگ تک رسائی کی اجازت دیں؟"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"ایک غیر بھروسہ مند بلوٹوتھ آلہ، [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]، آپ کے رابطوں اور کال لاگ تک رسائی حاصل کرنا چاہتا ہے۔ اس میں آنے اور جانے والی کالز کے بارے میں ڈیٹا شامل ہے۔\n\nآپ پہلے کبھی بھی [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] سے منسلک نہیں ہوئے ہیں۔"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"ایک غیر بھروسہ مند بلوٹوتھ آلہ، <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>، آپ کے رابطوں اور کال لاگ تک رسائی حاصل کرنا چاہتا ہے۔ اس میں آنے اور جانے والی کالز کے بارے میں ڈیٹا شامل ہے۔\n\nآپ پہلے کبھی بھی <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> سے منسلک نہیں ہوئے ہیں۔"</string>
+    <!-- no translation found for category_name_brightness (8520372392029305084) -->
+    <skip />
+    <!-- no translation found for category_name_lock_display (7478785189102882266) -->
+    <skip />
+    <!-- no translation found for category_name_visibility (4485030512199246405) -->
+    <skip />
+    <!-- no translation found for category_name_color (937514550918977151) -->
+    <skip />
+    <!-- no translation found for category_name_others (2366006298768550310) -->
+    <skip />
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-uz/arrays.xml b/res/values-uz/arrays.xml
index d2f82b7..9d885b2 100644
--- a/res/values-uz/arrays.xml
+++ b/res/values-uz/arrays.xml
@@ -499,8 +499,8 @@
     <item msgid="2047166446768045816">"Bu – bepul tarmoq"</item>
   </string-array>
   <string-array name="wifi_privacy_entries">
-    <item msgid="3485945604919292489">"Ixtiyoriy MAC manzil (standart)"</item>
-    <item msgid="741680937828608749">"Ixtiyoriy MAC manzil"</item>
+    <item msgid="3485945604919292489">"Tasodifiy MAC manzil (standart)"</item>
+    <item msgid="741680937828608749">"Qurilmaning MAC manzili"</item>
   </string-array>
   <string-array name="wifi_hidden_entries">
     <item msgid="342232116597649254">"Yo‘q"</item>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 1b6ad87..7f672f1 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -27,8 +27,8 @@
       <item quantity="other">Deyarli tugadi, <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ta qadam qoldi.</item>
       <item quantity="one">Deyarli tugadi, <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> ta qadam qoldi.</item>
     </plurals>
-    <string name="show_dev_on" msgid="2840850085134853754">"Siz endi ishlab chiquvchisiz!"</string>
-    <string name="show_dev_already" msgid="7041756429707644630">"Shart emas, siz allaqachon dasturchi rejimiga o‘tgansiz."</string>
+    <string name="show_dev_on" msgid="2840850085134853754">"Siz endi dasturchi rejimidasiz!"</string>
+    <string name="show_dev_already" msgid="7041756429707644630">"Shart emas, siz allaqachon dasturchi rejimidasiz."</string>
     <string name="dev_settings_disabled_warning" msgid="6971867026249671244">"Avval dasturchi sozlamalarini yoqing."</string>
     <string name="header_category_wireless_networks" msgid="303445626075235229">"Simsiz tarmoqlar"</string>
     <string name="header_category_system" msgid="1665516346845259058">"Tizim"</string>
@@ -1218,7 +1218,7 @@
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Ekranga qarab turganingizda u yoniq holatda qoladi"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Moslashuvchan kutish rejimi kimdir old kameraga qaraganini aniqlashda ishlatiladi U faqat qurilmada ishlatiladi va rasmlar hech qachon Google serverlariga yuborilmaydi."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Moslashuvchan kutish rejimini yoqish"</string>
-    <string name="adaptive_sleep_contextual_slice_summary" msgid="2993867044745446094">"Tomosha qilayotganda ekranni ochiq qoldirish"</string>
+    <string name="adaptive_sleep_contextual_slice_summary" msgid="2993867044745446094">"Ekranga qarab turilganida u yoniq turadi"</string>
     <string name="night_display_title" msgid="8532432776487216581">"Tungi rejim"</string>
     <string name="night_display_text" msgid="4789324042428095383">"Tungi rejimda ekraningiz xira sariq tusga kiradi. Bu ekranga kunning xira qismida qarashni osonlashtiradi va osonroq uyquga ketishga yordamlashadi."</string>
     <string name="night_display_auto_mode_title" msgid="5869128421470824381">"Jadval"</string>
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Tugash vaqti"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Holati"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intensivlik"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Yoqilmagan / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Hech qachon avtomatik yoqilmaydi"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"<xliff:g id="ID_1">%1$s</xliff:g> da avtomatik yoqiladi"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Quyosh botishi bilan avtomatik yoqiladi"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Yoniq / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Hech qachon avtomatik o‘chirib qo‘yilmaydi"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"<xliff:g id="ID_1">%1$s</xliff:g> da avtomatik tugaydi"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Quyosh chiqishi bilan avtomatik tugaydi"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Quyosh botishidan to chiqishigacha"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Muayyan vaqtda yoqiladi"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Holati"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Yoqilmagan / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Hech qachon avtomatik yoqilmaydi"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Quyosh botishi bilan avtomatik yoqiladi"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"<xliff:g id="ID_1">%1$s</xliff:g> da avtomatik yoqiladi"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Yoniq / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Hech qachon avtomatik faolsizlantirilmaydi"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Quyosh chiqishi bilan avtomatik tugaydi"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"<xliff:g id="ID_1">%1$s</xliff:g> da avtomatik faolsizlantiriladi"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Ekrandan o‘qish vositalari"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio va ekrandagi matn"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Ekran"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Boshqaruv elementlari"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Yuklab olingan ilovalar"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Tajribaviy"</string>
@@ -2456,7 +2454,7 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Planshet odatdagidan ko‘proq ishlatildi"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Qurilma odatdagidan ko‘proq ishlatildi"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Batareya quvvati odatdagiga nisbatan tezroq tugashi mumkin"</string>
-    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Batareya quvvati muvozanatlanmoqda"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Batareya uchun optimizatsiya"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Batareya quvvati darajasi vaqtincha cheklangan. Batafsil axborot olish uchun bosing."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Telefoningiz odatdagidan koʻproq ishlatildi. Batareya quvvati kutilgandan tezroq tugashi mumkin.\n\nBatareyani eng koʻp sarflagan ilovalar:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Planshetingiz odatdagidan koʻproq ishlatildi. Batareya quvvati kutilgandan tezroq tugashi mumkin.\n\nBatareyani eng koʻp sarflagan ilovalar:"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Foydalanuvchini o‘chirib tashlash"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"O‘chirib tashlash"</string>
     <string name="user_guest" msgid="4545590092001460388">"Mehmon"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Mehmon hisobini o‘chirish"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Mehmon hisobi o‘chirib tashlansinmi?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Mehmon maʼlumotlarini tozalash"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Mehmon seansini yakunlash"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Mehmon seansi yakunlansinmi?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Ushbu seansdagi barcha ilovalar va ma’lumotlar o‘chirib tashlanadi."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Olib tashlash"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Seansni yakunlash"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Telefon chaqiruvlari"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Telefon chaqiruvlari va SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Foydalanuvchini olib tashlash"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Quyi darajali suhbatlar"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Siz oʻzgartirish kiritgan suhbatlar"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Oxirgi suhbatlar"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Oxirgilarni tozalash"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Oxirgilarini tozalash"</string>
     <string name="clear" msgid="5092178335409471100">"Tozalash"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Muhim suhbatlar pufakchali chiqsin"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Muhim suhbatlar bildirishnomalar panelining tepasida chiqadi. Siz ularni qalqib chiqadigan va Bezovta qilinmasin rejimida ham bildirishnoma chiqadigan qilishingiz mumkin."</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Bir nechta qurilmaga ulangan"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Tizim interfeysi demo rejimi"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Tungi mavzu"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Yoniq / Quvvat tejash uchun vaqtincha faolsizlantirilgan"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Quvvat tejash rejimi sababli vaqtinchalik yoqilgan"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Qoʻllab-quvvatlanadigan ilovalar ham tungi mavzuga almashtiriladi"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"OK"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Sozlamalar"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Ochiq tarmoqlarga ulanish"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"tarmoq aloqasi, internet, simsiz, aloqa, wifi, wi-fi, wi fi, mobil, mobile, mobil tarmoq operatori, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Samolyotdagi xavfsiz tarmoqlar"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Parvoz rejimini oʻchirish"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Parvoz rejimi tarmoqlarini ochish"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Parvoz rejimini faolsizlantirish"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Ulandi"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet avtomatik ravishda ulanmaydi"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Boshqa tarmoqlar mavjud emas"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Hech qanday tarmoq mavjud emas"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Uyqu vaqti rejimi yoniqligi sababli ishlamaydi"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Muhim bildirishnomalar sozlamalari tiklandi."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Ilovalar"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Notanish qurilma xabarlaringizga kirmoqchi. Batafsil."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Xabarlarga kirishga ruxsat berilsinmi?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Notanish Bluetooth qurilmasi ([<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]) xabarlaringizga kirmoqchi.\n\nSiz ilgari [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] qurilmasiga ulanmagansiz."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Notanish Bluetooth qurilmasi (<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>) xabarlaringizga kirmoqchi.\n\nSiz ilgari <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> qurilmasiga ulanmagansiz."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Notanish qurilma kontakt va chaqiruvlar jurnaliga kirmoqchi. Batafsil."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Chaqiruvlar va chaqiruvlar jurnaliga kirishga ruxsat berilsinmi?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Notanish Bluetooth qurilmasi ([<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]) kontakt va chaqiruvlaringiz tarixiga kirmoqchi. Bunga kiruvchi va chiquvchi chaqiruvlar ham kiradi.\n\nSiz ilgari [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] qurilmasiga ulanmagansiz."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Notanish Bluetooth qurilmasi ([<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]) kontakt va chaqiruvlaringiz tarixiga kirmoqchi. Bunga kiruvchi va chiquvchi chaqiruvlar ham kiradi.\n\nSiz ilgari <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> qurilmasiga ulanmagansiz."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Yorqinlik"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Displeyni qulflash"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Ochiqligi"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Rang"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Boshqalar"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index bf510f8..e5e3ef0 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Thời gian kết thúc"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Trạng thái"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Cường độ"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Đang tắt/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Sẽ không bao giờ tự động bật"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Sẽ tự động bật lúc <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Sẽ tự động bật lúc hoàng hôn"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Bật / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Sẽ không bao giờ tự động tắt"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Sẽ tự động tắt lúc <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Sẽ tự động tắt lúc bình minh"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Bật từ lúc mặt trời lặn đến lúc mặt trời mọc"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Bật vào thời gian tùy chỉnh"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Trạng thái"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Đang tắt/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Sẽ không bao giờ tự động bật"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Sẽ tự động bật lúc hoàng hôn"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Sẽ tự động bật lúc <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Đang bật/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Sẽ không bao giờ tự động tắt"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Sẽ tự động tắt lúc bình minh"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Sẽ tự động tắt lúc <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Trình đọc màn hình"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Âm thanh và văn bản trên màn hình"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Hiển thị"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Điều khiển tương tác"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Ứng dụng đã tải xuống"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Thử nghiệm"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Xóa người dùng"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Xóa"</string>
     <string name="user_guest" msgid="4545590092001460388">"Khách"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Xóa chế độ khách"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Xóa phiên khách?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Xóa dữ liệu khách"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Kết thúc phiên khách"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Kết thúc phiên khách?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Tất cả ứng dụng và dữ liệu trong phiên này sẽ bị xóa."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Xóa"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Kết thúc phiên"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Bật cuộc gọi điện thoại"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Bật cuộc gọi điện thoại và SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Xóa người dùng"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Cuộc trò chuyện không ưu tiên"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Cuộc trò chuyện mà bạn đã thay đổi"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Cuộc trò chuyện gần đây"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Xóa cuộc trò chuyện gần đây"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Xóa mọi mục gần đây"</string>
     <string name="clear" msgid="5092178335409471100">"Xóa"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Hiển thị các cuộc trò chuyện ưu tiên ở dạng bong bóng"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Các cuộc trò chuyện ưu tiên sẽ hiển thị ở đầu ngăn kéo xuống. Bạn cũng có thể chuyển các cuộc trò chuyện này sang dạng bong bóng và tạm thời dừng chế độ Không làm phiền."</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Đã kết nối với nhiều thiết bị"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Chế độ thử nghiệm giao diện người dùng hệ thống"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Giao diện tối"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Đang bật/Tạm thời tắt do Trình tiết kiệm pin"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Tạm thời bật do Trình tiết kiệm pin"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Các ứng dụng được hỗ trợ cũng sẽ chuyển sang giao diện tối"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Đã hiểu"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Lựa chọn ưu tiên"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Kết nối với mạng công cộng"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"kết nối mạng, Internet, không dây, dữ liệu, wifi, wi-fi, wi fi, di động, nhà mạng di động, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Xem các mạng an toàn với máy bay"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Tắt Chế độ trên máy bay"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Xem các mạng khi ở chế độ trên máy bay"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Tắt chế độ trên máy bay"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Đã kết nối"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"Sẽ không tự động kết nối Internet"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Không có mạng nào khác"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Không có mạng"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Không dùng được vì chế độ giờ đi ngủ đang bật"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Đã hoàn tất việc đặt lại mức độ quan trọng của thông báo."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Ứng dụng"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Thiết bị không tin cậy muốn truy cập vào tin nhắn của bạn. Hãy nhấn để biết thông tin chi tiết."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Cho phép truy cập vào tin nhắn?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Một thiết bị Bluetooth không tin cậy [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] muốn truy cập vào tin nhắn của bạn.\n\nBạn chưa từng kết nối với [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Một thiết bị Bluetooth không tin cậy là <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> muốn truy cập vào tin nhắn của bạn.\n\nBạn chưa từng kết nối với <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Thiết bị không tin cậy muốn truy cập vào danh bạ và nhật ký cuộc gọi của bạn. Hãy nhấn để biết thông tin chi tiết."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Cho phép truy cập vào danh bạ và nhật ký cuộc gọi?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Một thiết bị Bluetooth không tin cậy [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] muốn truy cập vào danh bạ và nhật ký cuộc gọi của bạn. Trong đó có cả dữ liệu về cuộc gọi đi và cuộc gọi đến.\n\nBạn chưa từng kết nối với [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Một thiết bị Bluetooth không tin cậy là <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> muốn truy cập vào danh bạ và nhật ký cuộc gọi của bạn. Trong đó có cả dữ liệu về cuộc gọi đi và cuộc gọi đến.\n\nBạn chưa từng kết nối với <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Độ sáng"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Màn hình khóa"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Chế độ hiển thị"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Màu"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Khác"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 2c6deca..2593704 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"结束时间"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"状态"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"强度"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"关闭 / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"一律不自动开启"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"将在<xliff:g id="ID_1">%1$s</xliff:g>自动开启"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"将在日落时自动开启"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"开启 / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"一律不自动关闭"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"将在<xliff:g id="ID_1">%1$s</xliff:g>自动关闭"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"将在日出时自动关闭"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"在日落到日出期间开启"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"在设定的时间开启"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"状态"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"关闭/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"一律不自动开启"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"将在日落时自动开启"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"将在<xliff:g id="ID_1">%1$s</xliff:g> 自动开启"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"开启/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"一律不自动关闭"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"将在日出时自动关闭"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"将在<xliff:g id="ID_1">%1$s</xliff:g> 自动关闭"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"屏幕阅读器"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"音频和屏幕上的文字"</string>
     <string name="display_category_title" msgid="6638191682294461408">"显示"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"互动控件"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"已下载的应用"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"实验性功能"</string>
@@ -2815,7 +2813,7 @@
     <string name="sync_gmail" msgid="228561698646018808">"Gmail"</string>
     <string name="sync_calendar" msgid="4603704438090387251">"日历"</string>
     <string name="sync_contacts" msgid="2376465611511325472">"联系人"</string>
-    <string name="sync_plug" msgid="7956982719077985381"><font fgcolor="#ffffffff">"欢迎使用 Google Sync！"</font>" \n这款数据同步工具可让您随时随地查看您的联系人、约会以及更多信息。"</string>
+    <string name="sync_plug" msgid="7956982719077985381"><font fgcolor="#ffffffff">"欢迎使用 Google 同步！"</font>" \n这款数据同步工具可让您随时随地查看您的联系人、约会以及更多信息。"</string>
     <string name="header_application_sync_settings" msgid="7427706834875419243">"应用同步设置"</string>
     <string name="header_data_and_synchronization" msgid="453920312552838939">"数据与同步"</string>
     <string name="preference_change_password_title" msgid="5465821666939825972">"更改密码"</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"删除用户"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"删除"</string>
     <string name="user_guest" msgid="4545590092001460388">"访客"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"移除访客"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"要移除访客吗？"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"清除访客数据"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"结束访客会话"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"要结束访客会话吗？"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"此会话中的所有应用和数据都将被删除。"</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"移除"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"结束会话"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"开启通话功能"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"开启通话和短信功能"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"删除用户"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"非优先对话"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"您已更改的对话"</string>
     <string name="recent_conversations" msgid="471678228756995274">"近期对话"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"清除近期项"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"清除所有最近的对话"</string>
     <string name="clear" msgid="5092178335409471100">"清除"</string>
     <string name="important_bubble" msgid="7911698275408390846">"以对话泡形式显示优先对话"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"优先对话会显示在下拉通知栏顶部。您也可将优先对话设置为以对话泡形式显示，并允许系统在“勿扰”模式下显示此类对话泡。"</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"已连接到多部设备"</string>
     <string name="demo_mode" msgid="6566167465451386728">"系统界面演示模式"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"深色主题"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"开启/由于省电模式已开启，切换功能已暂时停用"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"由于省电模式已关闭，切换功能已暂时启用"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"受支持的应用还会切换到深色主题"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"知道了"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"偏好设置"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"连接到公共网络"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"网络连接, 互联网, 无线, 数据, WiFi, Wi-Fi, Wi Fi, WLAN, 移动网络, 移动, 手机运营商, 4G, 3G, 2G, LTE"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"查看可在飞机上安全使用的网络"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"关闭飞行模式"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"查看飞行模式网络"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"关闭飞行模式"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"已连接"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"不会自动连接到互联网"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"没有其他可用网络"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"没有可用网络"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"就寝模式开启时无法使用"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"通知重要性重置完成。"</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"应用"</string>
-    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"不受信任的设备想要查看您的消息。点按可了解详情。"</string>
-    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"要允许查看消息吗？"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"不受信任的蓝牙设备 [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] 想要查看您的消息。\n\n您之前没有连接过 [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]。"</string>
-    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"不受信任的设备想要查看您的通讯录和通话记录。点按可了解详情。"</string>
-    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"要允许查看通讯录和通话记录吗？"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"不受信任的蓝牙设备 [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] 想要查看您的通讯录和通话记录，包括有关来电和去电的数据。\n\n您之前没有连接过 [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]。"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"不受信任的设备想要访问您的消息。点按可了解详情。"</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"要允许访问消息吗？"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"不受信任的蓝牙设备“<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>”想要访问您的消息。\n\n您之前没有连接过“<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>”。"</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"不受信任的设备想要访问您的通讯录和通话记录。点按可了解详情。"</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"要允许访问通讯录和通话记录吗？"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"不受信任的蓝牙设备“<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>”想要访问您的通讯录和通话记录，包括有关来电和去电的数据。\n\n您之前没有连接过“<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>”。"</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"亮度"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"锁定显示屏"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"公开范围"</string>
+    <string name="category_name_color" msgid="937514550918977151">"颜色"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"其他"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index eda46c6..93c211a 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"結束時間"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"狀態"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"強度"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"關閉/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"永遠不會自動開啟"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"將會在<xliff:g id="ID_1">%1$s</xliff:g>自動開啟"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"將會在日落時自動開啟"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"開啟/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"永遠不會自動關閉"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"將會在<xliff:g id="ID_1">%1$s</xliff:g>自動關閉"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"將會在日出時自動關閉"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"由日落至日出期間開啟"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"在自訂時間開啟"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"狀態"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"關閉/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"永遠不會自動開啟"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"日落時會自動開啟"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"將會在<xliff:g id="ID_1">%1$s</xliff:g>自動開啟"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"開啟/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"永遠不會自動關閉"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"日出時會自動關閉"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"將會在<xliff:g id="ID_1">%1$s</xliff:g>自動關閉"</string>
@@ -2137,6 +2133,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"螢幕閱讀器"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"音訊和螢幕上的文字"</string>
     <string name="display_category_title" msgid="6638191682294461408">"螢幕"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"互動控制項"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"已下載的應用程式"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"實驗性"</string>
@@ -2457,7 +2455,7 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"平板電腦使用率比平常高"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"裝置使用率比平常高"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"電池電量可能會比平常更快耗盡"</string>
-    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"正在優化電池狀態"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"優化電池效能"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"暫時限制電池充電。輕按即可瞭解詳情。"</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"您的手機使用率比平常高，電池電量可能會比預期更快耗盡。\n\n電池用量最高的應用程式："</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"您的平板電腦使用率比平常高，電池電量可能會比預期更快耗盡。\n\n電池用量最高的應用程式："</string>
@@ -3076,10 +3074,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"刪除使用者"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"刪除"</string>
     <string name="user_guest" msgid="4545590092001460388">"訪客"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"移除訪客"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"移除訪客？"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"清除訪客資料"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"結束訪客工作階段"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"要結束訪客工作階段嗎？"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"這個工作階段中的所有應用程式和資料都會被刪除。"</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"移除"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"結束工作階段"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"開啟通話功能"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"開啟通話和短訊功能"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"刪除使用者"</string>
@@ -3592,7 +3591,7 @@
     <string name="other_conversations" msgid="551178916855139870">"非優先對話"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"已變更的對話"</string>
     <string name="recent_conversations" msgid="471678228756995274">"最近的對話"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"清除最近的聊天"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"清除所有最近的資料"</string>
     <string name="clear" msgid="5092178335409471100">"清除"</string>
     <string name="important_bubble" msgid="7911698275408390846">"優先對話用對話氣泡顯示"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"優先對話會在下拉式面板頂部顯示。您亦可設定用對話氣泡並在「請勿騷擾」模式中顯示優先對話。"</string>
@@ -4425,7 +4424,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"已連接多部裝置"</string>
     <string name="demo_mode" msgid="6566167465451386728">"系統使用者介面示範模式"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"深色主題背景"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"開啟/由於「省電模式」已開啟，因此切換功能暫時停用"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"由於「省電模式」已關閉，因此切換功能暫時啟用"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"受支援的應用程式也會切換至深色主題背景"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"知道了"</string>
@@ -5064,15 +5064,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"偏好設定"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"連線至公共網絡"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"網絡連線, 互聯網, 無線, 數據, Wi-Fi, 流動網絡, 流動裝置, 流動網絡供應商, 4G, 3G, 2G, LTE"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"查看飛行安全網絡"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"關閉飛行模式"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"查看飛行模式網絡"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"關閉飛行模式"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"已連線"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"不會自動連線至互聯網"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"沒有可用的其他網絡"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"沒有可用的網絡"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"睡眠模式開啟時無法使用"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"通知重要性重設完成。"</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"應用程式"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"不信任的裝置想存取您的訊息。輕按即可瞭解詳情。"</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"要允許存取訊息嗎？"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"不信任的藍牙裝置 [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] 想存取您的訊息。\n\n請注意，您從未連接 [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]。"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"不信任的藍牙裝置 [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] 想存取您的訊息。\n\n請注意，您從未連接 [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]。"</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"不信任的裝置要求存取您的聯絡人和通話記錄。輕按即可瞭解詳情。"</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"要允許存取聯絡人和通話記錄嗎？"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"不信任的藍牙裝置 [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] 要求存取您的聯絡人和通話記錄，包括來電和撥出電話的資料。\n\n您從未連接 [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]。"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"不信任的藍牙裝置 [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] 要求存取您的聯絡人和通話記錄，包括來電和撥出電話的資料。\n\n您從未連接 [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]。"</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"光暗度"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"鎖定顯示屏"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"分享設定"</string>
+    <string name="category_name_color" msgid="937514550918977151">"顏色"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"其他"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index beed3f6..486f1d7 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"結束時間"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"狀態"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"強度"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"關閉/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"一律不自動開啟"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"將於<xliff:g id="ID_1">%1$s</xliff:g> 自動開啟"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"將於日落時自動開啟"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"開啟/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"一律不自動關閉"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"將於<xliff:g id="ID_1">%1$s</xliff:g> 自動關閉"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"將於日出時自動關閉"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"在日落到日出之間開啟"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"在自訂時間開啟"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"狀態"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"關閉/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"一律不自動開啟"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"將於日落時自動開啟"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"將於<xliff:g id="ID_1">%1$s</xliff:g> 自動開啟"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"開啟/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"一律不自動關閉"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"將於日出時自動關閉"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"將於<xliff:g id="ID_1">%1$s</xliff:g> 自動關閉"</string>
@@ -2136,6 +2132,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"螢幕閱讀器"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"音訊和畫面上的文字"</string>
     <string name="display_category_title" msgid="6638191682294461408">"螢幕"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"互動控制項"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"下載的應用程式"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"實驗性"</string>
@@ -2456,7 +2454,7 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"平板電腦使用率比平常高"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"裝置使用率比平常高"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"電池電量可能會比平常更快耗盡"</string>
-    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"針對電池狀態進行最佳化調整"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"最佳化調整電池狀態"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"系統已暫時限制電池用量。輕觸即可瞭解詳情。"</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"你的手機使用率比平常高，電池電量可能比預期更快耗盡。\n\n你常用的應用程式如下 (按照電池用量由高到低排序)："</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"你的平板電腦使用率比平常高，電池電量可能比預期更快耗盡。\n\n你常用的應用程式如下 (按照電池用量由高到低排序)："</string>
@@ -3075,10 +3073,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"刪除使用者"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"刪除"</string>
     <string name="user_guest" msgid="4545590092001460388">"訪客"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"移除訪客"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"移除訪客？"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"清除訪客資料"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"結束訪客工作階段"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"要結束訪客工作階段嗎？"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"這個工作階段中的所有應用程式和資料都會遭到刪除。"</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"移除"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"結束工作階段"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"開啟通話功能"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"開啟通話和簡訊功能"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"刪除使用者"</string>
@@ -3591,7 +3590,7 @@
     <string name="other_conversations" msgid="551178916855139870">"非優先對話"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"你已變更的對話"</string>
     <string name="recent_conversations" msgid="471678228756995274">"最近的對話"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"清除最近的項目"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"清除所有最近的對話"</string>
     <string name="clear" msgid="5092178335409471100">"清除"</string>
     <string name="important_bubble" msgid="7911698275408390846">"以泡泡形式顯示優先對話"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"優先對話會顯示在下拉式通知欄的頂端。你也可以設定讓優先對話以泡泡的形式顯示，並允許系統在「零打擾」模式下顯示這類泡泡。"</string>
@@ -4424,7 +4423,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"已連線到多個裝置"</string>
     <string name="demo_mode" msgid="6566167465451386728">"系統 UI 示範模式"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"深色主題"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"開啟/因「省電模式」而暫時停用"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"因「省電模式」而暫時啟用"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"支援的應用程式也會切換為深色主題"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"我知道了"</string>
@@ -5063,15 +5063,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"偏好設定"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"連線至公用網路"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"網路連線, 網際網路, 無線, 行動數據, wifi, wi-fi, wi fi, 行動網路, 行動, 電信業者, 4g, 3g, 2g, lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"查看飛航安全網路"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"關閉飛航模式"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"查看飛航模式網路"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"關閉飛航模式"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"已連線"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"不會自動連上網際網路"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"沒有可用的其他網路"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"沒有可用的網路"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"就寢時間模式開啟時無法使用"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"通知重要性重設完成。"</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"應用程式"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"不受信任的裝置想要存取你的訊息。輕觸即可瞭解詳情。"</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"要允許存取訊息嗎？"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"不受信任的藍牙裝置 [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] 想要存取你的訊息。\n\n請注意，你從未連結到 [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]。"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"不受信任的藍牙裝置「<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>」想要存取你的訊息。\n\n請注意，你從未連線到「<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>」。"</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"不受信任的裝置想要存取你的聯絡人和通話記錄。輕觸即可瞭解詳情。"</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"要允許存取聯絡人和通話記錄嗎？"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"不受信任的藍牙裝置 [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] 想要存取你的聯絡人和通話記錄，包括你接聽及撥打的電話。\n\n請注意，你從未連結到 [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]。"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"不受信任的藍牙裝置「<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>」想要存取你的聯絡人和通話記錄，包括你接聽及撥打的電話。\n\n請注意，你從未連線到「<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>」。"</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"亮度"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"鎖定螢幕"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"瀏覽權限"</string>
+    <string name="category_name_color" msgid="937514550918977151">"色彩"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"其他"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index dc84b5d..fec43f4 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -1229,11 +1229,9 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Isikhathi sokuphela"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Isimo"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Ukuqina"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Valiwe / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Ngeke ize ivuleke ngokuzenzakalela"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Izovula ngokuzenzakalela ngo-<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Izovuleka ngokuzenzakalela ekushoneni kwelanga"</string>
-    <string name="night_display_summary_on" msgid="8932395375143965229">"Vuliwe / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Ngeke ize ivaleke ngokuzenzakalela"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Izovaleka ngokuzenzakalela ngo-<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Izovaleka ngokuzenzakalela ekuphumeni kwelanga"</string>
@@ -1256,11 +1254,9 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Ivula kusuka ekuseni kuya entambama"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Ivula ngesikhathi sangokwezifiso"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Isimo"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Kuvaliwe / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Ngeke ize ivuleke ngokuzenzakalela"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Izovuleka ngokuzenzakalela ekushoneni kwelanga"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Izovula ngokuzenzakalela ngo-<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_summary_on" msgid="3886998135388176000">"Vuliwe / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Ngeke ize ivaleke ngokuzenzakalela"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Izovaleka ngokuzenzakalela ekuphumeni kwelanga"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Izovaleka ngokuzenzakalela ngo-<xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2137,6 +2133,8 @@
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Izifundi zesikrini"</string>
     <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Umsindo nombhalo okusikrini"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Bonisa"</string>
+    <!-- no translation found for accessibility_text_and_display_title (1398507755501334961) -->
+    <skip />
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Izilawuli zokubandakanya"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"Izinhlelo zokusebenza ezila"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"Okokulinga"</string>
@@ -3076,10 +3074,11 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Susa umsebenzisi"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Susa"</string>
     <string name="user_guest" msgid="4545590092001460388">"Isivakashi"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Susa isivakashi"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Susa isivakashi?"</string>
+    <string name="user_clear_guest_menu" msgid="4864362688187480452">"Sula idatha yesihambeli"</string>
+    <string name="user_exit_guest_menu" msgid="5064400453222497734">"Misa isikhathi sesihambeli"</string>
+    <string name="user_exit_guest_confirm_title" msgid="7526978959527761497">"Misa isikhathi sesihambeli?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Zonke izinhlelo zokusebenza nedatha kulesi sikhathi zizosuswa."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Susa"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="8095094235815676847">"Phothula iseshini"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Vula amakholi wamafoni"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Vula amakholi wefoni ne-SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Susa umsebenzisi"</string>
@@ -3592,7 +3591,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Akuzona izingxoxo ezibalulekile"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Izingxoxo owenze izinguquko kuzo"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Izingxoxo zakamuva"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Sula okwakamuva"</string>
+    <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Sula zonke ezakamuva"</string>
     <string name="clear" msgid="5092178335409471100">"Sula"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Izingxoxo ezibalulekile zebhamuza"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Izingxoxo ezibalulekile ziboniswa phezulu komthunzi wokudonsela phansi. Futhi ungazisethela kubhamuza uphinde uphazamise Ukungaphazamisi."</string>
@@ -4425,7 +4424,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Ixhumeke kumadivayisi amaningi"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Imodi yedemo ye-UI yesistimu"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Itimu emnyama"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Vuliwe / Kukhutshaziwe okwesikhashana ngenxa yesilondolozi sebhethri"</string>
+    <!-- no translation found for dark_ui_mode_disabled_summary_dark_theme_on (4554134480159161533) -->
+    <skip />
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Kuvulwe okwesikhashana ngenxa yesilondolozi sebhethri"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Izinhlelo zokusebenza ezisekelwe nazo zizoshintshela kutimu emnyama"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Ngiyezwa"</string>
@@ -5064,15 +5064,27 @@
     <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Okuncamelayo"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Xhuma kumanethiwekhi asesidlangalaleni"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"uxhumano lenethiwekhi, i-inthanethi, okungenantambo, idatha, i-wifi, i-wi-fi, i-wi fi, iselula, iselula, inkampani yekholi, i-4g, i-3g, i-2g, i-lte"</string>
-    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Buka amanethiwekhi wendiza aphephile"</string>
-    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Vala imodi yendiza"</string>
+    <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Buka amanethiwekhi wemodi yendiza"</string>
+    <string name="turn_off_airplane_mode" msgid="7141986366534514443">"Vala imodi yendiza"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="mobile_data_connection_active" msgid="2422223108911581552">"Ixhunyiwe"</string>
+    <string name="mobile_data_off_summary" msgid="3841411571485837651">"I-inthanethi ngeke ixhumeke ngokuzenzakalelayo"</string>
+    <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Awekho amanye amanethiwekhi atholakalayo"</string>
+    <string name="all_network_unavailable" msgid="1163897808282057496">"Awekho amanethiwekhi atholakalayo"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Akutholakali ngoba imodi yesikhathi sokulala ivuliwe"</string>
     <string name="reset_importance_completed" msgid="3595536767426097205">"Ukusetha kabusha ukubaluleka kwesaziso kuqediwe."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Izinhlelo zokusebenza"</string>
     <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Idivayisi engathenjwa ifuna ukufinyelela imilayezo yakho. Thepha ukuze uthole imininingwane."</string>
     <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Vumela ukufinyelela kumilayezo?"</string>
-    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Idivayisi ye-Bluetooth engathenjwa, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ifuna ukufinyelela imilayezo yakho.\n\nAwukaze uxhume ku-[<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ngaphambili."</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="2304761898608701739">"Idivayisi ye-Bluetooth engathenjwa, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, ifuna ukufinyelela imilayezo yakho.\n\nAwukaze uxhumeke ku-<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> ngaphambilini."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Idivayisi engathenjwa ifuna ukufinyelela koxhumana nabo nakurekhodi lamakholi. Thepha ukuze uthole imininingwane."</string>
     <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Vumela ukufinyelela koxhumana nabo nakurekhodi lamakholi?"</string>
-    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Idivayisi ye-Bluetooth engathenjwa, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ifuna ukufinyelela koxhumana nabo nakurekhodi lamakholi. Lokhu kufaka phakathi nedatha emayelana namakholi angenayo naphumayo.\n\nAwukaze uxhume ku-[<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ngaphambili."</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"Idivayisi ye-Bluetooth engathenjwa, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, ifuna ukufinyelela koxhumana nabo nakurekhodi lamakholi. Lokhu kufaka phakathi nedatha emayelana namakholi angenayo naphumayo.\n\nAwukaze uxhumeke ku-<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> ngaphambilini."</string>
+    <string name="category_name_brightness" msgid="8520372392029305084">"Ukugqama"</string>
+    <string name="category_name_lock_display" msgid="7478785189102882266">"Khiya isiboniso"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"Ukubonakala"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Umbala"</string>
+    <string name="category_name_others" msgid="2366006298768550310">"Abanye"</string>
+    <!-- no translation found for category_name_general (7737273712848115886) -->
+    <skip />
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index f8df920..3528f9f 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1532,4 +1532,21 @@
         <item>8</item>
         <item>12</item>
     </string-array>
+
+    <!-- Array of titles list for notification listener notification types. [DO NOT TRANSLATE] -->
+    <string-array name="notif_types_titles" translatable="false">
+        <item>@string/notif_type_ongoing</item>
+        <item>@string/notif_type_conversation</item>
+        <item>@string/notif_type_alerting</item>
+        <item>@string/notif_type_silent</item>
+    </string-array>
+
+    <!-- Values of list for notification listener notification types. Values need to match
+    android.service.notification.NotificationListenerService. [DO NOT TRANSLATE] -->
+    <string-array name="notif_types_values" translatable="false">
+        <item>8</item>
+        <item>1</item>
+        <item>2</item>
+        <item>4</item>
+    </string-array>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 58b8aa4..2ce3949 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -92,6 +92,7 @@
     <color name="homepage_security_background">#0F9D58</color>
     <color name="homepage_accounts_background">#F15B8D</color>
     <color name="homepage_accessibility_background">#5011C1</color>
+    <color name="homepage_emergency_background">#F28B82</color>
     <color name="homepage_system_background">#9E9E9E</color>
     <color name="homepage_support_background">#26459C</color>
     <color name="homepage_generic_icon_background">#1A73E8</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 7809f05..bc01d59 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -123,13 +123,20 @@
     <dimen name="switchbar_subsettings_margin_start">72dp</dimen>
     <dimen name="switchbar_subsettings_margin_end">16dp</dimen>
 
+    <!-- Search bar and avatar -->
     <dimen name="search_bar_margin">24dp</dimen>
     <dimen name="search_bar_height">48dp</dimen>
-    <dimen name="search_bar_text_size">16dp</dimen>
+    <dimen name="search_bar_text_size">16sp</dimen>
     <dimen name="search_bar_card_elevation">2dp</dimen>
     <dimen name="search_bar_content_inset">64dp</dimen>
     <dimen name="avatar_length">@dimen/search_bar_height</dimen>
 
+    <!-- Contextual suggestions -->
+    <dimen name="suggestion_height">224dp</dimen>
+    <dimen name="suggestion_padding_horizontal">24dp</dimen>
+    <dimen name="suggestion_padding_bottom">8dp</dimen>
+    <dimen name="suggestion_button_margin_top">16dp</dimen>
+    <dimen name="suggestion_button_padding_horizontal">24dp</dimen>
 
     <!-- Dimensions for Wifi Assistant Card -->
     <dimen name="wifi_assistant_padding_top_bottom">16dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 50f9424..d687357 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -879,7 +879,9 @@
     <!-- Introduction title shown in fingerprint enrollment to introduce the fingerprint feature, when fingerprint unlock is disabed by device admin [CHAR LIMIT=40] -->
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled">Use your fingerprint</string>
     <!-- Introduction detail message shown in fingerprint enrollment dialog [CHAR LIMIT=NONE]-->
-    <string name="security_settings_fingerprint_enroll_introduction_message">Just touch the fingerprint sensor to unlock your phone, authorize purchases, or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN.</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message">Just touch the fingerprint sensor to unlock your phone, authorize purchases, or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things.</string>
+    <!-- Introduction detail message shown in the bottom of fingerprint enrollment dialog [CHAR LIMIT=NONE]-->
+    <string name="security_settings_fingerprint_enroll_introduction_bottom_message">Your fingerprint may be less secure than a strong pattern or PIN.</string>
     <!-- Introduction detail message shown in fingerprint enrollment dialog, when fingerprint unlock is disabled by device admin [CHAR LIMIT=NONE]-->
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled">Use your fingerprint to unlock your phone or approve purchases.\n\nNote: You can\u2019t use your fingerprint to unlock this device. For more information, contact your organization\u2019s admin.</string>
     <!-- Introduction detail message shown in fingerprint enrollment screen in setup wizard. [CHAR LIMIT=NONE]-->
@@ -2824,16 +2826,12 @@
     <string name="night_display_status_title">Status</string>
     <!-- Night display screen, setting the color temperature of the display. [CHAR LIMIT=30] -->
     <string name="night_display_temperature_title">Intensity</string>
-    <!-- Display settings screen, summary format of night display when off. [CHAR LIMIT=NONE] -->
-    <string name="night_display_summary_off">Off / <xliff:g name="auto_mode_summary" example="Never turn on automatically">%1$s</xliff:g></string>
     <!-- Display settings screen, summary of night display when off and will *never* turn on automatically. [CHAR LIMIT=NONE] -->
     <string name="night_display_summary_off_auto_mode_never">Will never turn on automatically</string>
          <!-- Display settings screen, summary format of night display when off and will turn on automatically at a user defined time. [CHAR LIMIT=NONE] -->
     <string name="night_display_summary_off_auto_mode_custom">Will turn on automatically at <xliff:g name="time" example="6 AM">%1$s</xliff:g></string>
     <!-- Display settings screen, summary of night display when off and will turn on automatically at sunset. [CHAR LIMIT=NONE] -->
     <string name="night_display_summary_off_auto_mode_twilight">Will turn on automatically at sunset</string>
-    <!-- Display settings screen, summary format of night display when on. [CHAR LIMIT=NONE] -->
-    <string name="night_display_summary_on">On / <xliff:g name="auto_mode_summary" example="Never turn off automatically">%1$s</xliff:g></string>
     <!-- Display settings screen, summary of night display when on and will *never* turn off automatically. [CHAR LIMIT=NONE] -->
     <string name="night_display_summary_on_auto_mode_never">Will never turn off automatically</string>
     <!-- Display settings screen, summary format of night display when on and will turn off automatically at a user defined time. [CHAR LIMIT=NONE] -->
@@ -2882,16 +2880,12 @@
     <string name="dark_ui_auto_mode_custom">Turns on at custom time</string>
     <!-- Dark UI screen, setting option name controlling the current activation status. [CHAR LIMIT=30] -->
     <string name="dark_ui_status_title">Status</string>
-    <!-- Display settings screen, summary format of Dark UI when off. [CHAR LIMIT=NONE] -->
-    <string name="dark_ui_summary_off">Off / <xliff:g name="auto_mode_summary" example="Never turn on automatically">%1$s</xliff:g></string>
     <!-- Display settings screen, summary of Dark UI when off and will *never* turn on automatically. [CHAR LIMIT=NONE] -->
     <string name="dark_ui_summary_off_auto_mode_never">Will never turn on automatically</string>
     <!-- Display settings screen, summary of Dark UI when off and will turn on automatically at sunset. [CHAR LIMIT=NONE] -->
     <string name="dark_ui_summary_off_auto_mode_auto">Will turn on automatically at sunset</string>
         <!-- Display settings screen, summary format of night display when off and will turn on automatically at a user defined time. [CHAR LIMIT=NONE] -->
     <string name="dark_ui_summary_off_auto_mode_custom">Will turn on automatically at <xliff:g name="time" example="6 AM">%1$s</xliff:g></string>
-    <!-- Display settings screen, summary format of Dark UI when on. [CHAR LIMIT=NONE] -->
-    <string name="dark_ui_summary_on">On / <xliff:g name="auto_mode_summary" example="Never turn off automatically">%1$s</xliff:g></string>
     <!-- Display settings screen, summary of Dark UI when on and will *never* turn off automatically. [CHAR LIMIT=NONE] -->
     <string name="dark_ui_summary_on_auto_mode_never">Will never turn off automatically</string>
     <!-- Display settings screen, summary of Dark UI when on and will turn off automatically at sunrise. [CHAR LIMIT=NONE] -->
@@ -4952,6 +4946,8 @@
     <string name="audio_and_captions_category_title">Audio &amp; on-screen text</string>
     <!-- Title for the accessibility preference category of display services and settings. [CHAR LIMIT=50] -->
     <string name="display_category_title">Display</string>
+    <!-- Title for the accessibility text options page. [CHAR LIMIT=50] -->
+    <string name="accessibility_text_and_display_title">Text and display</string>
     <!-- Title for the accessibility preference category of interaction control services and settings. [CHAR LIMIT=50] -->
     <string name="interaction_control_category_title">Interaction controls</string>
     <!-- Title for the accessibility preference category of services downloaded by the user. [CHAR LIMIT=50] -->
@@ -7111,13 +7107,15 @@
     <!-- Title for Guest user [CHAR LIMIT=35] -->
     <string name="user_guest">Guest</string>
     <!-- Label for item to exit guest mode [CHAR LIMIT=35] -->
-    <string name="user_exit_guest_title">Remove guest</string>
+    <string name="user_clear_guest_menu">Clear guest data</string>
+    <!-- Label for item to exit guest mode [CHAR LIMIT=35] -->
+    <string name="user_exit_guest_menu">End guest session</string>
     <!-- Title of dialog to user to confirm exiting guest. [CHAR LIMIT=50] -->
-    <string name="user_exit_guest_confirm_title">Remove guest?</string>
+    <string name="user_exit_guest_confirm_title">End guest session?</string>
     <!-- Message to user to confirm exiting guest. [CHAR LIMIT=none] -->
     <string name="user_exit_guest_confirm_message">All apps and data in this session will be deleted.</string>
     <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
-    <string name="user_exit_guest_dialog_remove">Remove</string>
+    <string name="user_exit_guest_dialog_remove">End session</string>
 
     <!-- Title of preference to enable calling[CHAR LIMIT=40] -->
     <string name="user_enable_calling">Turn on phone calls</string>
@@ -8586,8 +8584,8 @@
     <!-- [CHAR LIMIT=100] preference category title -->
     <string name="recent_conversations">Recent conversations</string>
 
-    <!-- [CHAR LIMIT=20] button title -->
-    <string name="conversation_settings_clear_recents">Clear recents</string>
+    <!-- [CHAR LIMIT=40] button title -->
+    <string name="conversation_settings_clear_recents">Clear all of the recent ones</string>
 
     <!-- a11y string -->
     <string name="clear">Clear</string>
@@ -8760,6 +8758,11 @@
     </string>
     <string name="notification_listener_disable_warning_confirm">Turn off</string>
     <string name="notification_listener_disable_warning_cancel">Cancel</string>
+    <string name="notification_listener_type_title">Allowed notification types</string>
+    <string name="notif_type_ongoing">Important ongoing notifications</string>
+    <string name="notif_type_conversation">Conversation notifications</string>
+    <string name="notif_type_alerting">Alerting notifications</string>
+    <string name="notif_type_silent">Silent notifications</string>
 
     <!-- Title for managing VR (virtual reality) helper services. [CHAR LIMIT=50] -->
     <string name="vr_listeners_title">VR helper services</string>
@@ -10866,7 +10869,7 @@
     <string name="dark_ui_mode">Dark theme</string>
 
     <!-- [CHAR LIMIT=60] Summary string on dark theme explaining why the toggle is disabled while the setting is still on-->
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on">On / Temporarily disabled due to Battery Saver</string>
+    <string name="dark_ui_mode_disabled_summary_dark_theme_on">Temporarily disabled due to Battery Saver</string>
 
     <!-- [CHAR LIMIT=60] Summary string on dark theme explaining why the toggle is disabled while the setting is off-->
     <string name="dark_ui_mode_disabled_summary_dark_theme_off">Temporarily turned on due to Battery Saver</string>
@@ -10990,6 +10993,9 @@
     <!-- Summary for settings suggestion for swipe up to switch apps [CHAR LIMIT=60] -->
     <string name="swipe_up_to_switch_apps_suggestion_summary">Turn on the new gesture to switch apps</string>
 
+    <!-- Preference title for "Safety & emergency" settings page [CHAR LIMIT=60]-->
+    <string name="emergency_settings_preference_title">Safety &amp; emergency</string>
+
     <!-- Title text for edge to edge navigation [CHAR LIMIT=60] -->
     <string name="edge_to_edge_navigation_title">Gesture navigation</string>
     <!-- Summary text for edge to edge navigation [CHAR LIMIT=NONE] -->
@@ -12523,18 +12529,23 @@
     <!-- Search keywords for "Internet" settings [CHAR_LIMIT=NONE] -->
     <string name="keywords_internet">network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, cell carrier, 4g, 3g, 2g, lte</string>
     <!-- Label text to view airplane-safe networks. [CHAR LIMIT=40] -->
-    <string name="view_airplane_safe_networks">View airplane-safe networks</string>
+    <string name="view_airplane_safe_networks">View airplane mode networks</string>
     <!-- Label text to turn off airplane mode. [CHAR LIMIT=40] -->
-    <string name="turn_off_airplane_mode">Turn off Airplane Mode</string>
+    <string name="turn_off_airplane_mode">Turn off airplane mode</string>
 
-    <!-- Provider Model: Summary indicating that a SIM has an active mobile data connection [CHAR LIMIT=50] -->
-    <string name="mobile_data_connection_active">Active, <xliff:g id="network_data_rat" example="LTE">%1$s</xliff:g></string>
-    <!-- Provider Model: Summary indicating that a SIM has an active mobile data connection [CHAR LIMIT=50] -->
-    <string name="mobile_data_off_summary">Internet off</string>
-    <!-- Provider Model: Summary indicating that non-carrier network unavailable [CHAR LIMIT=50] -->
-    <string name="non_carrier_network_unavailable">Non\u2011carrier networks unavailable</string>
-    <!-- Provider Model: Summary indicating that non-carrier and carrier network unavailable [CHAR LIMIT=50] -->
-    <string name="all_network_unavailable">Networks unavailable</string>
+    <!-- Summary text separator for preferences including a short description
+         (eg. "Connected / 5G"). [CHAR LIMIT=50] -->
+    <string name="preference_summary_default_combination"><xliff:g id="state" example="Connected">%1$s</xliff:g> / <xliff:g id="networkMode" example="LTE">%2$s</xliff:g></string>
+    <!-- Provider Model:
+         Summary indicating that a SIM has an active mobile data connection [CHAR LIMIT=50] -->
+    <string name="mobile_data_connection_active">Connected</string>
+    <!-- Provider Model:
+         Summary indicating that a SIM has no mobile data connection [CHAR LIMIT=50] -->
+    <string name="mobile_data_off_summary">Internet won\u0027t auto\u2011connect</string>
+    <!-- Provider Model: Summary indicating that no other networks available [CHAR LIMIT=50] -->
+    <string name="non_carrier_network_unavailable">No other networks available</string>
+    <!-- Provider Model: Summary indicating that no networks available [CHAR LIMIT=50] -->
+    <string name="all_network_unavailable">No networks available</string>
 
     <!-- Summary for preference when Bedtime mode is on [CHAR LIMIT=NONE] -->
     <string name="aware_summary_when_bedtime_on">Unavailable because bedtime mode is on</string>
@@ -12557,4 +12568,17 @@
     <string name="bluetooth_phonebook_access_dialog_title">Allow access to contacts and call log?</string>
     <!-- Bluetooth phonebook permission alert for dialog content [CHAR LIMIT=none] -->
     <string name="bluetooth_phonebook_access_dialog_content">An untrusted Bluetooth device, <xliff:g id="device_name" example="My device">%1$s</xliff:g>, wants to access your contacts and call log. This includes data about incoming and outgoing calls.\n\nYou haven\u2019t connected to <xliff:g id="device_name" example="My device">%2$s</xliff:g> before.</string>
+
+    <!-- Brightness category name in Display Settings [CHAR LIMIT=none] -->
+    <string name="category_name_brightness">Brightness</string>
+    <!-- Lock screen category name in Display Settings [CHAR LIMIT=none] -->
+    <string name="category_name_lock_display">Lock Display</string>
+    <!-- Visibility category name in Display Settings [CHAR LIMIT=none] -->
+    <string name="category_name_visibility">Visibility</string>
+    <!-- Color category name in Display Settings [CHAR LIMIT=none] -->
+    <string name="category_name_color">Color</string>
+    <!-- Others category name [CHAR LIMIT=none] -->
+    <string name="category_name_others">Others</string>
+    <!-- General category name [CHAR LIMIT=none] -->
+    <string name="category_name_general">General</string>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index fd4d268..ce6b095 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -782,6 +782,14 @@
         <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
     </style>
 
+    <style name="ContextualSuggestionText" parent="@android:style/TextAppearance.DeviceDefault">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textSize">32sp</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
+    </style>
+
     <style name="RequestManageCredentialsButtonPanel">
         <item name="android:paddingStart">12dp</item>
         <item name="android:paddingEnd">12dp</item>
diff --git a/res/values/styles_preference.xml b/res/values/styles_preference.xml
index b88a9fb..6453458 100644
--- a/res/values/styles_preference.xml
+++ b/res/values/styles_preference.xml
@@ -25,16 +25,9 @@
         <item name="slicePreferenceStyle">@style/SlicePreference</item>
         <item name="seekBarPreferenceStyle">@style/SettingsSeekBarPreference</item>
         <item name="twoStateButtonPreferenceStyle">@style/TwoStateButtonPreference</item>
-        <item name="preferenceCategoryTitleTextAppearance">@style/TextAppearance.CategoryTitle
-        </item>
-        <item name="preferenceCategoryStyle">@style/SettingsCategoryPreference</item>
-        <!-- For preference category color -->
-        <item name="preferenceCategoryTitleTextColor">?android:attr/textColorSecondary</item>
         <item name="preferenceFragmentCompatStyle">@style/SettingsPreferenceFragmentStyle</item>
     </style>
 
-    <style name="SettingsCategoryPreference" parent="Preference.Category.Material" />
-
     <style name="PreferenceTheme.SetupWizard">
         <item name="preferenceFragmentCompatStyle">@style/SetupWizardPreferenceFragmentStyle</item>
         <item name="preferenceStyle">@style/Preference.Material</item>
diff --git a/res/values/themes_suw.xml b/res/values/themes_suw.xml
index 98ab28d..959ffb3 100644
--- a/res/values/themes_suw.xml
+++ b/res/values/themes_suw.xml
@@ -197,8 +197,8 @@
         <item name="android:textAllCaps">false</item>
 
         <item name="android:windowSoftInputMode">adjustResize</item>
-        <!-- copied from Theme.DeviceDefault.Light.Dialog.Alert -->
-        <item name="colorAccent">@*android:color/accent_device_default_light</item>
+        <!-- copied from Theme.DeviceDefault.Dialog.Alert -->
+        <item name="colorAccent">@*android:color/accent_device_default_dark</item>
         <item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
     </style>
 
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index 6781e28..6efd884 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -45,52 +45,19 @@
         android:title="@string/display_category_title">
 
         <Preference
-            android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"
-            android:key="font_size_preference_screen"
+            android:fragment="com.android.settings.accessibility.TextAndDisplayFragment"
+            android:key="text_and_display_preference_screen"
             android:persistent="false"
-            android:title="@string/title_font_size"
-            settings:controller="com.android.settings.display.FontSizePreferenceController"
-            settings:searchable="false"/>
+            android:title="@string/accessibility_text_and_display_title"
+            settings:searchable="true"/>
 
-     <com.android.settings.display.ScreenZoomPreference
-            android:fragment="com.android.settings.display.ScreenZoomSettings"
-            android:key="accessibility_settings_screen_zoom"
-            android:persistent="false"
-            android:title="@string/screen_zoom_title"
-            settings:searchable="false"/>
-
-       <SwitchPreference
-            android:key="dark_ui_mode_accessibility"
-            android:persistent="false"
-            android:title="@string/dark_ui_mode"
-            settings:controller="com.android.settings.display.DarkUIPreferenceController"
-            settings:searchable="false"/>
-
-       <Preference
+        <Preference
             android:fragment="com.android.settings.accessibility.MagnificationPreferenceFragment"
             android:icon="@drawable/ic_accessibility_magnification"
             android:key="magnification_preference_screen"
             android:persistent="false"
             android:title="@string/accessibility_screen_magnification_title"
             settings:controller="com.android.settings.accessibility.MagnificationPreferenceController"/>
-
-        <SwitchPreference
-            android:key="toggle_large_pointer_icon"
-            android:persistent="false"
-            android:title="@string/accessibility_toggle_large_pointer_icon_title"
-            settings:controller="com.android.settings.accessibility.LargePointerIconPreferenceController"/>
-
-        <SwitchPreference
-            android:key="toggle_disable_animations"
-            android:persistent="false"
-            android:title="@string/accessibility_disable_animations"
-            settings:controller="com.android.settings.accessibility.DisableAnimationsPreferenceController"/>
-
-        <SwitchPreference
-            android:key="toggle_force_bold_text"
-            android:persistent="false"
-            android:title="@string/force_bold_text"
-            settings:controller="com.android.settings.accessibility.FontWeightAdjustmentPreferenceController"/>
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -203,42 +170,12 @@
         settings:initialExpandedChildrenCount="1">
 
         <SwitchPreference
-            android:key="toggle_high_text_contrast_preference"
-            android:persistent="false"
-            android:title="@string/accessibility_toggle_high_text_contrast_preference_title"
-            settings:controller="com.android.settings.accessibility.HighTextContrastPreferenceController"/>
-
-        <Preference
-            android:fragment="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment"
-            android:icon="@drawable/ic_daltonizer"
-            android:key="daltonizer_preference"
-            android:persistent="false"
-            android:title="@string/accessibility_display_daltonizer_preference_title"
-            settings:controller="com.android.settings.accessibility.DaltonizerPreferenceController"/>
-
-        <Preference
-            android:fragment="com.android.settings.accessibility.ToggleColorInversionPreferenceFragment"
-            android:icon="@drawable/ic_color_inversion"
-            android:key="toggle_inversion_preference"
-            android:persistent="false"
-            android:title="@string/accessibility_display_inversion_preference_title"
-            settings:controller="com.android.settings.accessibility.ColorInversionPreferenceController"/>
-
-        <SwitchPreference
             android:key="accessibility_shortcut_preference"
             android:persistent="false"
             android:title="@string/accessibility_shortcut_service_on_lock_screen_title"
             android:summary="@string/accessibility_shortcut_description"
             settings:controller="com.android.settings.accessibility.AccessibilityShortcutPreferenceController"/>
 
-        <!--TODO(b/170973645): Get icon-->
-        <Preference
-            android:fragment="com.android.settings.accessibility.ToggleReduceBrightColorsPreferenceFragment"
-            android:key="reduce_bright_colors_preference"
-            android:persistent="false"
-            android:title="@string/reduce_bright_colors_preference_title"
-            settings:controller="com.android.settings.accessibility.ReduceBrightColorsPreferenceController"/>
-
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/accessibility_text_and_display.xml b/res/xml/accessibility_text_and_display.xml
new file mode 100644
index 0000000..7dce826
--- /dev/null
+++ b/res/xml/accessibility_text_and_display.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="accessibility_text_and_display"
+    android:persistent="false"
+    android:title="@string/accessibility_text_and_display_title">
+
+    <SwitchPreference
+        android:key="toggle_high_text_contrast_preference"
+        android:persistent="false"
+        android:title="@string/accessibility_toggle_high_text_contrast_preference_title"
+        settings:controller="com.android.settings.accessibility.HighTextContrastPreferenceController"/>
+
+    <SwitchPreference
+        android:key="dark_ui_mode_accessibility"
+        android:persistent="false"
+        android:title="@string/dark_ui_mode"
+        settings:controller="com.android.settings.display.DarkUIPreferenceController"
+        settings:searchable="false"/>
+
+    <Preference
+        android:fragment="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment"
+        android:icon="@drawable/ic_daltonizer"
+        android:key="daltonizer_preference"
+        android:persistent="false"
+        android:title="@string/accessibility_display_daltonizer_preference_title"
+        settings:controller="com.android.settings.accessibility.DaltonizerPreferenceController"/>
+
+    <Preference
+        android:fragment="com.android.settings.accessibility.ToggleColorInversionPreferenceFragment"
+        android:icon="@drawable/ic_color_inversion"
+        android:key="toggle_inversion_preference"
+        android:persistent="false"
+        android:title="@string/accessibility_display_inversion_preference_title"
+        settings:controller="com.android.settings.accessibility.ColorInversionPreferenceController"/>
+
+    <!--TODO(b/170973645): Get icon-->
+    <Preference
+        android:fragment="com.android.settings.accessibility.ToggleReduceBrightColorsPreferenceFragment"
+        android:key="reduce_bright_colors_preference"
+        android:persistent="false"
+        android:title="@string/reduce_bright_colors_preference_title"
+        settings:controller="com.android.settings.accessibility.ReduceBrightColorsPreferenceController"/>
+
+    <SwitchPreference
+        android:key="toggle_disable_animations"
+        android:persistent="false"
+        android:title="@string/accessibility_disable_animations"
+        settings:controller="com.android.settings.accessibility.DisableAnimationsPreferenceController"/>
+
+    <com.android.settings.display.ScreenZoomPreference
+        android:fragment="com.android.settings.display.ScreenZoomSettings"
+        android:key="accessibility_settings_screen_zoom"
+        android:persistent="false"
+        android:title="@string/screen_zoom_title"
+        settings:searchable="false"/>
+
+    <Preference
+        android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"
+        android:key="font_size_preference_screen"
+        android:persistent="false"
+        android:title="@string/title_font_size"
+        settings:controller="com.android.settings.display.FontSizePreferenceController"
+        settings:searchable="false"/>
+
+    <SwitchPreference
+        android:key="toggle_force_bold_text"
+        android:persistent="false"
+        android:title="@string/force_bold_text"
+        settings:controller="com.android.settings.accessibility.FontWeightAdjustmentPreferenceController"/>
+
+    <SwitchPreference
+        android:key="toggle_large_pointer_icon"
+        android:persistent="false"
+        android:title="@string/accessibility_toggle_large_pointer_icon_title"
+        settings:controller="com.android.settings.accessibility.LargePointerIconPreferenceController"/>
+
+    <PreferenceCategory
+        android:key="experimental_category"
+        android:persistent="false"
+        android:title="@string/experimental_category_title"
+        settings:initialExpandedChildrenCount="1">
+    </PreferenceCategory>
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index f5549f9..06887f8 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -652,6 +652,7 @@
     <com.android.settings.development.autofill.AutofillPreferenceCategory
         android:key="debug_autofill_category"
         android:title="@string/debug_autofill_category"
+        settings:searchable="false"
         android:order="1100"> <!-- Incremented by 100 from last order (i.e. 1000) -->
 
         <ListPreference
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 8262bb2..8df5696 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -40,12 +40,12 @@
         settings:controller="com.android.settings.display.DarkUIPreferenceController"
         settings:keywords="@string/keywords_dark_ui_mode"/>
 
-    <com.android.settings.display.NightDisplayPreference
+    <com.android.settings.widget.PrimarySwitchPreference
         android:key="night_display"
         android:title="@string/night_display_title"
         android:fragment="com.android.settings.display.NightDisplaySettings"
-        android:widgetLayout="@null"
-        settings:widgetLayout="@null"/>
+        settings:controller="com.android.settings.display.NightDisplayPreferenceController"
+        settings:keywords="@string/keywords_display_night_display"/>
 
     <Preference
         android:key="auto_brightness_entry"
diff --git a/res/xml/display_settings_v2.xml b/res/xml/display_settings_v2.xml
new file mode 100644
index 0000000..0b43914
--- /dev/null
+++ b/res/xml/display_settings_v2.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 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.
+-->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="display_settings_screen"
+    android:title="@string/display_settings"
+    settings:keywords="@string/keywords_display">
+
+    <PreferenceCategory
+        android:title="@string/category_name_brightness">
+
+        <com.android.settingslib.RestrictedPreference
+            android:key="brightness"
+            android:title="@string/brightness"
+            settings:keywords="@string/keywords_display_brightness_level"
+            settings:useAdminDisabledSummary="true"
+            settings:userRestriction="no_config_brightness">
+            <intent android:action="com.android.intent.action.SHOW_BRIGHTNESS_DIALOG"/>
+        </com.android.settingslib.RestrictedPreference>
+
+        <com.android.settings.widget.PrimarySwitchPreference
+            android:key="auto_brightness_entry"
+            android:title="@string/auto_brightness_title"
+            android:fragment="com.android.settings.display.AutoBrightnessSettings"
+            settings:controller="com.android.settings.display.AutoBrightnessPreferenceController"/>
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/category_name_lock_display">
+
+        <Preference
+            android:key="lockscreen_from_display_settings"
+            android:title="@string/lockscreen_settings_title"
+            android:fragment="com.android.settings.security.LockscreenDashboardFragment"
+            settings:keywords="@string/keywords_ambient_display_screen"
+            settings:controller="com.android.settings.security.screenlock.LockScreenPreferenceController"/>
+
+        <com.android.settingslib.RestrictedPreference
+            android:key="screen_timeout"
+            android:title="@string/screen_timeout"
+            android:summary="@string/summary_placeholder"
+            android:fragment="com.android.settings.display.ScreenTimeoutSettings"
+            settings:controller="com.android.settings.display.ScreenTimeoutPreferenceController"/>
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/category_name_visibility">
+
+        <com.android.settings.display.darkmode.DarkModePreference
+            android:key="dark_ui_mode"
+            android:title="@string/dark_ui_mode"
+            android:fragment="com.android.settings.display.darkmode.DarkModeSettingsFragment"
+            android:widgetLayout="@null"
+            settings:widgetLayout="@null"
+            settings:controller="com.android.settings.display.DarkUIPreferenceController"
+            settings:keywords="@string/keywords_dark_ui_mode"/>
+
+        <Preference
+            android:key="font_size"
+            android:title="@string/title_font_size"
+            android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"
+            settings:controller="com.android.settings.display.FontSizePreferenceController"
+            settings:keywords="@string/keywords_font_size"/>
+
+        <com.android.settings.display.ScreenZoomPreference
+            android:key="display_settings_screen_zoom"
+            android:title="@string/screen_zoom_title"
+            android:fragment="com.android.settings.display.ScreenZoomSettings"/>
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/category_name_color">
+
+        <com.android.settings.widget.PrimarySwitchPreference
+            android:key="night_display"
+            android:title="@string/night_display_title"
+            android:fragment="com.android.settings.display.NightDisplaySettings"
+            settings:controller="com.android.settings.display.NightDisplayPreferenceController"
+            settings:keywords="@string/keywords_display_night_display"/>
+
+        <Preference
+            android:key="color_mode"
+            android:title="@string/color_mode_title"
+            android:fragment="com.android.settings.display.ColorModePreferenceFragment"
+            settings:controller="com.android.settings.display.ColorModePreferenceController"
+            settings:keywords="@string/keywords_color_mode"/>
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/category_name_general">
+
+        <SwitchPreference
+            android:key="auto_rotate"
+            android:title="@string/accelerometer_title"
+            settings:keywords="@string/keywords_auto_rotate"
+            settings:controller="com.android.settings.display.AutoRotatePreferenceController"/>
+
+        <SwitchPreference
+            android:key="display_white_balance"
+            android:title="@string/display_white_balance_title"
+            android:summary="@string/display_white_balance_summary"
+            settings:controller="com.android.settings.display.DisplayWhiteBalancePreferenceController"/>
+
+        <SwitchPreference
+            android:key="peak_refresh_rate"
+            android:title="@string/peak_refresh_rate_title"
+            android:summary="@string/peak_refresh_rate_summary"
+            settings:controller="com.android.settings.display.PeakRefreshRatePreferenceController"/>
+
+        <SwitchPreference
+            android:key="show_operator_name"
+            android:title="@string/show_operator_name_title"
+            android:summary="@string/show_operator_name_summary"/>
+
+        <Preference
+            android:key="screensaver"
+            android:title="@string/screensaver_settings_title"
+            android:fragment="com.android.settings.dream.DreamSettings"/>
+
+        <SwitchPreference
+            android:key="camera_gesture"
+            android:title="@string/camera_gesture_title"
+            android:summary="@string/camera_gesture_desc"/>
+
+        <SwitchPreference
+            android:key="lift_to_wake"
+            android:title="@string/lift_to_wake_title"/>
+
+        <SwitchPreference
+            android:key="tap_to_wake"
+            android:title="@string/tap_to_wake"
+            android:summary="@string/tap_to_wake_summary"/>
+
+        <ListPreference
+            android:key="theme"
+            android:title="@string/device_theme"
+            android:summary="@string/summary_placeholder"/>
+
+        <Preference
+            android:key="vr_display_pref"
+            android:title="@string/display_vr_pref_title"
+            android:fragment="com.android.settings.display.VrDisplayPreferencePicker"/>
+    </PreferenceCategory>
+</PreferenceScreen>
diff --git a/res/xml/emergency_settings.xml b/res/xml/emergency_settings.xml
new file mode 100644
index 0000000..41b503e
--- /dev/null
+++ b/res/xml/emergency_settings.xml
@@ -0,0 +1,41 @@
+
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:title="@string/emergency_settings_preference_title">
+    <Preference
+        android:key="emergency_info"
+        android:title="@string/emergency_info_title"
+        android:summary="@string/summary_placeholder"
+        settings:controller="com.android.settings.accounts.EmergencyInfoPreferenceController"/>
+    <Preference
+        android:key="gesture_emergency_summary"
+        android:title="@string/emergency_gesture_screen_title"
+        android:fragment="com.android.settings.gestures.EmergencyGestureSettings"
+        settings:controller="com.android.settings.gestures.EmergencyGestureEntrypointPreferenceController" />
+    <com.android.settingslib.RestrictedPreference
+        android:key="app_and_notif_cell_broadcast_settings"
+        android:title="@string/cell_broadcast_settings"
+        settings:useAdminDisabledSummary="true">
+        <intent
+            android:action="android.intent.action.MAIN"
+            android:targetPackage="@string/cell_broadcast_receiver_package"
+            android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings"/>
+    </com.android.settingslib.RestrictedPreference>
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/notification_access_permission_details.xml b/res/xml/notification_access_permission_details.xml
index d956ce9..f7d928d 100644
--- a/res/xml/notification_access_permission_details.xml
+++ b/res/xml/notification_access_permission_details.xml
@@ -17,11 +17,35 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="notification_access_permission_detail_settings"
     android:title="@string/manage_notification_access_title">
 
+    <com.android.settingslib.widget.LayoutPreference
+        android:key="pref_app_header"
+        android:layout="@layout/settings_entity_header"
+        settings:controller="com.android.settings.applications.specialaccess.notificationaccess.HeaderPreferenceController"/>
+
     <com.android.settings.widget.FilterTouchesSwitchPreference
         android:key="notification_access_switch"
-        android:title="@string/notification_access_detail_switch"/>
+        android:title="@string/notification_access_detail_switch"
+        settings:controller="com.android.settings.applications.specialaccess.notificationaccess.ApprovalPreferenceController"/>
 
+    <MultiSelectListPreference
+        android:key="notification_type_filter"
+        android:title="@string/notification_listener_type_title"
+        android:entries="@array/notif_types_titles"
+        android:entryValues="@array/notif_types_values"
+        android:summary="%s"
+        android:persistent="false"
+        style="@style/SettingsMultiSelectListPreference"
+        settings:controller="com.android.settings.applications.specialaccess.notificationaccess.TypeFilterPreferenceController"/>/>
+
+    <PreferenceCategory
+        android:key="advanced"
+        android:order="50"
+        settings:initialExpandedChildrenCount="0">
+
+
+    </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/top_level_settings.xml b/res/xml/top_level_settings.xml
index 367f426..3c65f7b 100644
--- a/res/xml/top_level_settings.xml
+++ b/res/xml/top_level_settings.xml
@@ -125,6 +125,14 @@
         android:fragment="com.android.settings.accessibility.AccessibilitySettings"
         settings:controller="com.android.settings.accessibility.TopLevelAccessibilityPreferenceController"/>
 
+        <!--    TODO(b/175158310): Enable this tile when the setting content is more flushed out-->
+        <!--    <Preference-->
+        <!--        android:key="top_level_emergency"-->
+        <!--        android:title="@string/emergency_settings_preference_title"-->
+        <!--        android:icon="@drawable/ic_homepage_emergency"-->
+        <!--        android:order="-10"-->
+        <!--        android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"/>-->
+
     <Preference
         android:key="top_level_system"
         android:title="@string/header_category_system"
diff --git a/res/xml/top_level_settings_grouped.xml b/res/xml/top_level_settings_grouped.xml
index cdfab91..1ae6131 100644
--- a/res/xml/top_level_settings_grouped.xml
+++ b/res/xml/top_level_settings_grouped.xml
@@ -20,43 +20,38 @@
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="top_level_settings_grouped">
 
-    <PreferenceCategory
-        android:key="connectivity"
-        android:order="-130"
-        settings:allowDividerAbove="false">
-        <Preference
-            android:fragment="com.android.settings.network.NetworkDashboardFragment"
-            android:icon="@drawable/ic_homepage_network"
-            android:key="top_level_network"
-            android:order="-130"
-            android:title="@string/network_dashboard_title"
-            settings:controller="com.android.settings.network.TopLevelNetworkEntryPreferenceController"/>
+    <Preference
+        android:fragment="com.android.settings.network.NetworkDashboardFragment"
+        android:icon="@drawable/ic_homepage_network"
+        android:key="top_level_network"
+        android:order="-140"
+        android:title="@string/network_dashboard_title"
+        settings:controller="com.android.settings.network.TopLevelNetworkEntryPreferenceController"/>
 
-        <Preference
-            android:fragment="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"
-            android:icon="@drawable/ic_homepage_connected_device"
-            android:key="top_level_connected_devices"
-            android:order="-120"
-            android:title="@string/connected_devices_dashboard_title"
-            settings:controller="com.android.settings.connecteddevice.TopLevelConnectedDevicesPreferenceController"/>
-    </PreferenceCategory>
+    <Preference
+        android:fragment="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"
+        android:icon="@drawable/ic_homepage_connected_device"
+        android:key="top_level_connected_devices"
+        android:order="-130"
+        android:title="@string/connected_devices_dashboard_title"
+        settings:controller="com.android.settings.connecteddevice.TopLevelConnectedDevicesPreferenceController"/>
 
     <PreferenceCategory
         android:key="apps"
-        android:order="-110"
+        android:order="-120"
         settings:allowDividerAbove="false">
         <Preference
             android:fragment="com.android.settings.applications.AppAndNotificationDashboardFragment"
             android:icon="@drawable/ic_homepage_apps"
             android:key="top_level_apps_and_notifs"
-            android:order="-110"
+            android:order="-120"
             android:title="@string/apps_dashboard_title"/>
 
         <Preference
             android:fragment="com.android.settings.notification.ConfigureNotificationSettings"
             android:icon="@drawable/ic_homepage_notification"
             android:key="top_level_notification"
-            android:order="-100"
+            android:order="-110"
             android:title="@string/configure_notification_settings"/>
 
 
@@ -64,13 +59,13 @@
 
     <PreferenceCategory
         android:key="phone_essential"
-        android:order="-90"
+        android:order="-100"
         settings:allowDividerAbove="false">
         <Preference
             android:fragment="com.android.settings.fuelgauge.PowerUsageSummary"
             android:icon="@drawable/ic_homepage_battery"
             android:key="top_level_battery"
-            android:order="-90"
+            android:order="-100"
             android:title="@string/power_usage_summary_title"
             settings:controller="com.android.settings.fuelgauge.TopLevelBatteryPreferenceController"/>
 
@@ -78,7 +73,7 @@
             android:fragment="com.android.settings.deviceinfo.StorageSettings"
             android:icon="@drawable/ic_homepage_storage"
             android:key="top_level_storage"
-            android:order="-80"
+            android:order="-90"
             android:title="@string/storage_settings"
             settings:controller="com.android.settings.deviceinfo.TopLevelStoragePreferenceController"/>
 
@@ -86,17 +81,24 @@
             android:fragment="com.android.settings.notification.SoundSettings"
             android:icon="@drawable/ic_homepage_sound"
             android:key="top_level_sound"
-            android:order="-70"
+            android:order="-80"
             android:title="@string/sound_settings"/>
 
         <Preference
             android:fragment="com.android.settings.DisplaySettings"
             android:icon="@drawable/ic_homepage_display"
             android:key="top_level_display"
-            android:order="-60"
+            android:order="-70"
             android:title="@string/display_settings"
             settings:controller="com.android.settings.display.TopLevelDisplayPreferenceController"/>
 
+        <com.android.settingslib.RestrictedTopLevelPreference
+            android:icon="@drawable/ic_homepage_display"
+            android:key="top_level_wallpaper"
+            android:order="-60"
+            android:title="@string/wallpaper_settings_title"
+            settings:controller="com.android.settings.display.TopLevelWallpaperPreferenceController"/>
+
         <Preference
             android:fragment="com.android.settings.accessibility.AccessibilitySettings"
             android:icon="@drawable/ic_homepage_accessibility"
@@ -132,6 +134,13 @@
             android:order="-20"
             android:title="@string/security_settings_title"
             settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"/>
+        <!--    TODO(b/175158310): Enable this tile when the setting content is more flushed out-->
+        <!--        <Preference-->
+        <!--            android:key="top_level_emergency"-->
+        <!--            android:title="@string/emergency_settings_preference_title"-->
+        <!--            android:icon="@drawable/ic_homepage_emergency"-->
+        <!--            android:order="-10"-->
+        <!--            android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"/>-->
     </PreferenceCategory>
 
     <PreferenceCategory
diff --git a/res/xml/zen_mode_custom_rule_settings.xml b/res/xml/zen_mode_custom_rule_settings.xml
index 169a94f..8f360b9 100644
--- a/res/xml/zen_mode_custom_rule_settings.xml
+++ b/res/xml/zen_mode_custom_rule_settings.xml
@@ -22,11 +22,11 @@
 
     <PreferenceCategory
         android:key="zen_custom_rule_category">
-        <com.android.settings.notification.zen.ZenCustomRadioButtonPreference
+        <com.android.settingslib.widget.RadioButtonPreference
             android:key="zen_custom_rule_setting_default"
             android:title="@string/zen_mode_custom_behavior_summary_default"/>
 
-        <com.android.settings.notification.zen.ZenCustomRadioButtonPreference
+        <com.android.settingslib.widget.RadioButtonPreference
             android:key="zen_custom_rule_setting"
             android:title="@string/zen_mode_custom_behavior_summary" />
     </PreferenceCategory>
diff --git a/res/xml/zen_mode_restrict_notifications_settings.xml b/res/xml/zen_mode_restrict_notifications_settings.xml
index f5e7615..051c208 100644
--- a/res/xml/zen_mode_restrict_notifications_settings.xml
+++ b/res/xml/zen_mode_restrict_notifications_settings.xml
@@ -23,19 +23,19 @@
     <PreferenceCategory
         android:key="restrict_category"
         android:title="@string/zen_mode_restrict_notifications_category">
-        <com.android.settings.notification.zen.ZenCustomRadioButtonPreference
+        <com.android.settingslib.widget.RadioButtonPreference
             android:key="zen_mute_notifications"
             android:title="@string/zen_mode_restrict_notifications_mute"
             android:summary="@string/zen_mode_restrict_notifications_mute_summary"
             settings:searchable="false"/>
 
-        <com.android.settings.notification.zen.ZenCustomRadioButtonPreference
+        <com.android.settingslib.widget.RadioButtonPreference
             android:key="zen_hide_notifications"
             android:title="@string/zen_mode_restrict_notifications_hide"
             android:summary="@string/zen_mode_restrict_notifications_hide_summary"
             settings:searchable="false"/>
 
-        <com.android.settings.notification.zen.ZenCustomRadioButtonPreference
+        <com.android.settingslib.widget.RadioButtonPreference
             android:key="zen_custom"
             android:title="@string/zen_mode_restrict_notifications_custom"
             settings:searchable="false"/>
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index cbfbe7a..1cb9ade 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -19,13 +19,14 @@
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.os.Bundle;
+import android.provider.SearchIndexableResource;
+import android.util.FeatureFlagUtils;
 
+import com.android.settings.core.FeatureFlags;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.display.BrightnessLevelPreferenceController;
 import com.android.settings.display.CameraGesturePreferenceController;
 import com.android.settings.display.LiftToWakePreferenceController;
-import com.android.settings.display.NightDisplayPreferenceController;
-import com.android.settings.display.NightModePreferenceController;
 import com.android.settings.display.ScreenSaverPreferenceController;
 import com.android.settings.display.ShowOperatorNamePreferenceController;
 import com.android.settings.display.TapToWakePreferenceController;
@@ -37,6 +38,7 @@
 import com.android.settingslib.search.SearchIndexable;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
@@ -55,6 +57,9 @@
 
     @Override
     protected int getPreferenceScreenResId() {
+        if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.SILKY_HOME)) {
+            return R.xml.display_settings_v2;
+        }
         return R.xml.display_settings;
     }
 
@@ -78,8 +83,6 @@
         final List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(new CameraGesturePreferenceController(context));
         controllers.add(new LiftToWakePreferenceController(context));
-        controllers.add(new NightDisplayPreferenceController(context));
-        controllers.add(new NightModePreferenceController(context));
         controllers.add(new ScreenSaverPreferenceController(context));
         controllers.add(new TapToWakePreferenceController(context));
         controllers.add(new VrDisplayPreferenceController(context));
@@ -90,7 +93,16 @@
     }
 
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.display_settings) {
+            new BaseSearchIndexProvider() {
+
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(
+                        Context context, boolean enabled) {
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId = FeatureFlagUtils.isEnabled(context, FeatureFlags.SILKY_HOME)
+                            ? R.xml.display_settings_v2 : R.xml.display_settings;
+                    return Arrays.asList(sir);
+                }
 
                 @Override
                 public List<AbstractPreferenceController> createPreferenceControllers(
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index b226133..8389d84 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -144,6 +144,7 @@
     public static class NotificationAccessSettingsActivity extends SettingsActivity { /* empty */ }
     public static class NotificationAccessDetailsActivity extends SettingsActivity { /* empty */ }
     public static class VrListenersSettingsActivity extends SettingsActivity { /* empty */ }
+    public static class PremiumSmsAccessActivity extends SettingsActivity { /* empty */ }
     public static class PictureInPictureSettingsActivity extends SettingsActivity { /* empty */ }
     public static class AppPictureInPictureSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ZenAccessSettingsActivity extends SettingsActivity { /* empty */ }
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index e5bc3f5..4709c66 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -29,7 +29,6 @@
 import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
 import android.graphics.drawable.Drawable;
-import android.hardware.display.ColorDisplayManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
@@ -43,7 +42,6 @@
 import androidx.core.content.ContextCompat;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
-import androidx.preference.SwitchPreference;
 
 import com.android.internal.accessibility.AccessibilityShortcutController;
 import com.android.internal.content.PackageMonitor;
@@ -51,7 +49,6 @@
 import com.android.settings.Utils;
 import com.android.settings.accessibility.AccessibilityUtil.AccessibilityServiceFragmentType;
 import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.display.DarkUIPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.RestrictedLockUtilsInternal;
@@ -82,23 +79,14 @@
     private static final String CATEGORY_EXPERIMENTAL = "experimental_category";
     private static final String CATEGORY_DOWNLOADED_SERVICES = "user_installed_services_category";
 
-    private static final String[] CATEGORIES = new String[] {
+    private static final String[] CATEGORIES = new String[]{
             CATEGORY_SCREEN_READER, CATEGORY_AUDIO_AND_CAPTIONS, CATEGORY_DISPLAY,
             CATEGORY_INTERACTION_CONTROL, CATEGORY_EXPERIMENTAL, CATEGORY_DOWNLOADED_SERVICES
     };
 
     // Preferences
-    private static final String TOGGLE_INVERSION_PREFERENCE =
-            "toggle_inversion_preference";
-    private static final String TOGGLE_LARGE_POINTER_ICON =
-            "toggle_large_pointer_icon";
-    private static final String TOGGLE_DISABLE_ANIMATIONS = "toggle_disable_animations";
     private static final String DISPLAY_MAGNIFICATION_PREFERENCE_SCREEN =
             "magnification_preference_screen";
-    private static final String DISPLAY_DALTONIZER_PREFERENCE_SCREEN =
-            "daltonizer_preference";
-    private static final String DISPLAY_REDUCE_BRIGHT_COLORS_PREFERENCE_SCREEN =
-            "reduce_bright_colors_preference";
 
     // Extras passed to sub-fragments.
     static final String EXTRA_PREFERENCE_KEY = "preference_key";
@@ -167,13 +155,7 @@
     private final Map<ComponentName, PreferenceCategory> mPreBundledServiceComponentToCategoryMap =
             new ArrayMap<>();
 
-    private SwitchPreference mToggleLargePointerIconPreference;
-    private SwitchPreference mToggleDisableAnimationsPreference;
     private Preference mDisplayMagnificationPreferenceScreen;
-    private Preference mDisplayDaltonizerPreferenceScreen;
-    private Preference mToggleInversionPreference;
-    private Preference mReduceBrightColorsPreference;
-
 
     /**
      * Check if the color transforms are color accelerated. Some transforms are experimental only
@@ -226,7 +208,6 @@
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
-        use(DarkUIPreferenceController.class).setParentFragment(this);
         use(AccessibilityHearingAidPreferenceController.class)
                 .setFragmentManager(getFragmentManager());
     }
@@ -259,8 +240,8 @@
     /**
      * Returns the summary for the current state of this accessibilityService.
      *
-     * @param context A valid context
-     * @param info The accessibilityService's info
+     * @param context        A valid context
+     * @param info           The accessibilityService's info
      * @param serviceEnabled Whether the accessibility service is enabled.
      * @return The service summary
      */
@@ -299,8 +280,8 @@
     /**
      * Returns the description for the current state of this accessibilityService.
      *
-     * @param context A valid context
-     * @param info The accessibilityService's info
+     * @param context        A valid context
+     * @param info           The accessibilityService's info
      * @param serviceEnabled Whether the accessibility service is enabled.
      * @return The service description
      */
@@ -325,24 +306,9 @@
             mCategoryToPrefCategoryMap.put(CATEGORIES[i], prefCategory);
         }
 
-        // Display inversion.
-        mToggleInversionPreference = findPreference(TOGGLE_INVERSION_PREFERENCE);
-
-        // Large pointer icon.
-        mToggleLargePointerIconPreference = findPreference(TOGGLE_LARGE_POINTER_ICON);
-
-        mToggleDisableAnimationsPreference = findPreference(TOGGLE_DISABLE_ANIMATIONS);
-
         // Display magnification.
         mDisplayMagnificationPreferenceScreen = findPreference(
                 DISPLAY_MAGNIFICATION_PREFERENCE_SCREEN);
-
-        // Display color adjustments.
-        mDisplayDaltonizerPreferenceScreen = findPreference(DISPLAY_DALTONIZER_PREFERENCE_SCREEN);
-
-        // Reduce brightness.
-        mReduceBrightColorsPreference =
-                findPreference(DISPLAY_REDUCE_BRIGHT_COLORS_PREFERENCE_SCREEN);
     }
 
     private void updateAllPreferences() {
@@ -392,13 +358,13 @@
 
         // Update the order of all the category according to the order defined in xml file.
         updateCategoryOrderFromArray(CATEGORY_SCREEN_READER,
-            R.array.config_order_screen_reader_services);
+                R.array.config_order_screen_reader_services);
         updateCategoryOrderFromArray(CATEGORY_AUDIO_AND_CAPTIONS,
-            R.array.config_order_audio_and_caption_services);
+                R.array.config_order_audio_and_caption_services);
         updateCategoryOrderFromArray(CATEGORY_INTERACTION_CONTROL,
-            R.array.config_order_interaction_control_services);
+                R.array.config_order_interaction_control_services);
         updateCategoryOrderFromArray(CATEGORY_DISPLAY,
-            R.array.config_order_display_services);
+                R.array.config_order_display_services);
 
         // Need to check each time when updateServicePreferences() called.
         if (downloadedServicesCategory.getPreferenceCount() == 0) {
@@ -468,7 +434,7 @@
      * key with the string array of preference order which is defined in the xml.
      *
      * @param categoryKey The key of the category need to update the order
-     * @param key The key of the string array which defines the order of category
+     * @param key         The key of the string array which defines the order of category
      */
     private void updateCategoryOrderFromArray(String categoryKey, int key) {
         String[] services = getResources().getStringArray(key);
@@ -486,39 +452,11 @@
         }
     }
 
+    /**
+     * Updates preferences related to system configurations.
+     */
     protected void updateSystemPreferences() {
-        // Move color inversion and color correction preferences to Display category if device
-        // supports HWC hardware-accelerated color transform.
-        if (ColorDisplayManager.isColorTransformAccelerated(getContext())) {
-            PreferenceCategory experimentalCategory =
-                    mCategoryToPrefCategoryMap.get(CATEGORY_EXPERIMENTAL);
-            PreferenceCategory displayCategory =
-                    mCategoryToPrefCategoryMap.get(CATEGORY_DISPLAY);
-            experimentalCategory.removePreference(mToggleInversionPreference);
-            experimentalCategory.removePreference(mDisplayDaltonizerPreferenceScreen);
-            experimentalCategory.removePreference(mReduceBrightColorsPreference);
-            mDisplayMagnificationPreferenceScreen.setSummary(
-                    ToggleScreenMagnificationPreferenceFragment.getServiceSummary(getContext()));
-            mDisplayDaltonizerPreferenceScreen.setOrder(
-                    mDisplayMagnificationPreferenceScreen.getOrder() + 1);
-            mDisplayDaltonizerPreferenceScreen.setSummary(AccessibilityUtil.getSummary(
-                    getContext(), Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED));
-            mToggleInversionPreference.setOrder(
-                    mDisplayDaltonizerPreferenceScreen.getOrder() + 1);
-            mToggleLargePointerIconPreference.setOrder(
-                    mToggleInversionPreference.getOrder() + 1);
-            mToggleDisableAnimationsPreference.setOrder(
-                    mToggleLargePointerIconPreference.getOrder() + 1);
-            mToggleInversionPreference.setSummary(AccessibilityUtil.getSummary(
-                    getContext(), Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED));
-            mReduceBrightColorsPreference.setOrder(
-                    mToggleDisableAnimationsPreference.getOrder() + 1);
-            mReduceBrightColorsPreference.setSummary(AccessibilityUtil.getSummary(
-                    getContext(), Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED));
-            displayCategory.addPreference(mToggleInversionPreference);
-            displayCategory.addPreference(mDisplayDaltonizerPreferenceScreen);
-            displayCategory.addPreference(mReduceBrightColorsPreference);
-        }
+        // Do nothing.
     }
 
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
diff --git a/src/com/android/settings/accessibility/MagnificationCapabilities.java b/src/com/android/settings/accessibility/MagnificationCapabilities.java
new file mode 100644
index 0000000..079b06c
--- /dev/null
+++ b/src/com/android/settings/accessibility/MagnificationCapabilities.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2020 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.accessibility;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.annotation.IntDef;
+
+import com.android.settings.R;
+
+import com.google.common.primitives.Ints;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/** Class to provide magnification capabilities. */
+public final class MagnificationCapabilities {
+
+    private static final String KEY_CAPABILITY =
+            Settings.Secure.ACCESSIBILITY_MAGNIFICATION_CAPABILITY;
+
+    /**
+     * Annotation for supported magnification mode.
+     *
+     * @see Settings.Secure#ACCESSIBILITY_MAGNIFICATION_CAPABILITY
+     */
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({
+            MagnificationMode.FULLSCREEN,
+            MagnificationMode.WINDOW,
+            MagnificationMode.ALL,
+    })
+
+    public @interface MagnificationMode {
+        int FULLSCREEN = Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN;
+        int WINDOW = Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW;
+        int ALL = Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_ALL;
+    }
+
+    /**
+     * Gets the summary for the given {@code capabilities}.
+     *
+     * @param context A {@link Context}.
+     * @param capabilities Magnification capabilities {@link MagnificationMode}
+     * @return The summary text represents the given capabilities
+     */
+    public static String getSummary(Context context, @MagnificationMode int capabilities) {
+        final String[] summaries = context.getResources().getStringArray(
+                R.array.magnification_mode_summaries);
+        final int[] values = context.getResources().getIntArray(
+                R.array.magnification_mode_values);
+
+        final int idx = Ints.indexOf(values, capabilities);
+        return summaries[idx == /* no index exist */ -1 ? 0 : idx];
+    }
+
+    /**
+     * Sets the magnification capabilities {@link MagnificationMode} to settings key. This
+     * overwrites any existing capabilities.
+     *
+     * @param context      A {@link Context}.
+     * @param capabilities Magnification capabilities {@link MagnificationMode}
+     */
+    public static void setCapabilities(Context context, @MagnificationMode int capabilities) {
+        final ContentResolver contentResolver = context.getContentResolver();
+
+        Settings.Secure.putIntForUser(contentResolver, KEY_CAPABILITY, capabilities,
+                contentResolver.getUserId());
+    }
+
+    /**
+     * Returns the magnification capabilities {@link MagnificationMode} from setting's key. May be
+     * default value {@link MagnificationMode#FULLSCREEN} if not set.
+     *
+     * @param context A {@link Context}.
+     * @return The magnification capabilities {@link MagnificationMode}
+     */
+    @MagnificationMode
+    public static int getCapabilities(Context context) {
+        final ContentResolver contentResolver = context.getContentResolver();
+
+        return Settings.Secure.getIntForUser(contentResolver, KEY_CAPABILITY,
+                MagnificationMode.FULLSCREEN, contentResolver.getUserId());
+    }
+
+    private MagnificationCapabilities() {}
+}
diff --git a/src/com/android/settings/accessibility/MagnificationModePreferenceController.java b/src/com/android/settings/accessibility/MagnificationModePreferenceController.java
index b45ad88..5dc93b1 100644
--- a/src/com/android/settings/accessibility/MagnificationModePreferenceController.java
+++ b/src/com/android/settings/accessibility/MagnificationModePreferenceController.java
@@ -35,7 +35,7 @@
 
     @Override
     public CharSequence getSummary() {
-        return MagnificationSettingsFragment.getMagnificationCapabilitiesSummary(
-                mContext);
+        final int capabilities = MagnificationCapabilities.getCapabilities(mContext);
+        return MagnificationCapabilities.getSummary(mContext, capabilities);
     }
 }
diff --git a/src/com/android/settings/accessibility/MagnificationSettingsFragment.java b/src/com/android/settings/accessibility/MagnificationSettingsFragment.java
index 6b91fab..6003a6d 100644
--- a/src/com/android/settings/accessibility/MagnificationSettingsFragment.java
+++ b/src/com/android/settings/accessibility/MagnificationSettingsFragment.java
@@ -22,7 +22,6 @@
 
 import android.app.Dialog;
 import android.app.settings.SettingsEnums;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.provider.Settings;
@@ -31,6 +30,9 @@
 import android.view.ViewGroup;
 import android.widget.CheckBox;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 
 import com.android.settings.R;
@@ -38,8 +40,6 @@
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.search.SearchIndexable;
 
-import com.google.common.primitives.Ints;
-
 import java.util.StringJoiner;
 
 /** Settings page for magnification. */
@@ -48,45 +48,41 @@
 
     private static final String TAG = "MagnificationSettingsFragment";
     private static final String PREF_KEY_MODE = "magnification_mode";
-    private static final String KEY_CAPABILITY =
-            Settings.Secure.ACCESSIBILITY_MAGNIFICATION_CAPABILITY;
-    private static final int DIALOG_MAGNIFICATION_CAPABILITY = 1;
-    private static final int DIALOG_MAGNIFICATION_SWITCH_SHORTCUT = 2;
-    private static final String EXTRA_CAPABILITY = "capability";
+    @VisibleForTesting
+    static final int DIALOG_MAGNIFICATION_CAPABILITY = 1;
+    @VisibleForTesting
+    static final int DIALOG_MAGNIFICATION_SWITCH_SHORTCUT = 2;
+    @VisibleForTesting
+    static final String EXTRA_CAPABILITY = "capability";
     private static final int NONE = 0;
     private static final char COMPONENT_NAME_SEPARATOR = ':';
+
     private Preference mModePreference;
+    @VisibleForTesting
+    Dialog mDialog;
+    @VisibleForTesting
+    CheckBox mMagnifyFullScreenCheckBox;
+    @VisibleForTesting
+    CheckBox mMagnifyWindowCheckBox;
+
     private int mCapabilities = NONE;
-    private CheckBox mMagnifyFullScreenCheckBox;
-    private CheckBox mMagnifyWindowCheckBox;
-    private Dialog mDialog;
 
-    static String getMagnificationCapabilitiesSummary(Context context) {
-        final String[] magnificationModeSummaries = context.getResources().getStringArray(
-                R.array.magnification_mode_summaries);
-        final int[] magnificationModeValues = context.getResources().getIntArray(
-                R.array.magnification_mode_values);
-        final int capabilities = MagnificationSettingsFragment.getMagnificationCapabilities(
-                context);
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
 
-        final int idx = Ints.indexOf(magnificationModeValues, capabilities);
-        return magnificationModeSummaries[idx == -1 ? 0 : idx];
-    }
-
-    private static int getMagnificationCapabilities(Context context) {
-        return getSecureIntValue(context, KEY_CAPABILITY,
-                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN);
-    }
-
-    private static int getSecureIntValue(Context context, String key, int defaultValue) {
-        return Settings.Secure.getIntForUser(
-                context.getContentResolver(),
-                key, defaultValue, context.getContentResolver().getUserId());
+        if (savedInstanceState != null) {
+            mCapabilities = savedInstanceState.getInt(EXTRA_CAPABILITY, NONE);
+        }
+        if (mCapabilities == NONE) {
+            mCapabilities = MagnificationCapabilities.getCapabilities(getPrefContext());
+        }
     }
 
     @Override
-    public int getMetricsCategory() {
-        return SettingsEnums.ACCESSIBILITY_MAGNIFICATION_SETTINGS;
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        initModePreference();
     }
 
     @Override
@@ -96,14 +92,8 @@
     }
 
     @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-        if (savedInstanceState != null) {
-            mCapabilities = savedInstanceState.getInt(EXTRA_CAPABILITY, NONE);
-        }
-        if (mCapabilities == NONE) {
-            mCapabilities = getMagnificationCapabilities(getPrefContext());
-        }
+    public int getMetricsCategory() {
+        return SettingsEnums.ACCESSIBILITY_MAGNIFICATION_SETTINGS;
     }
 
     @Override
@@ -124,17 +114,6 @@
     }
 
     @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        mModePreference = findPreference(PREF_KEY_MODE);
-        mModePreference.setOnPreferenceClickListener(preference -> {
-            mCapabilities = getMagnificationCapabilities(getPrefContext());
-            showDialog(DIALOG_MAGNIFICATION_CAPABILITY);
-            return true;
-        });
-    }
-
-    @Override
     protected int getPreferenceScreenResId() {
         return R.xml.accessibility_magnification_service_settings;
     }
@@ -161,10 +140,19 @@
         throw new IllegalArgumentException("Unsupported dialogId " + dialogId);
     }
 
+    private void initModePreference() {
+        mModePreference = findPreference(PREF_KEY_MODE);
+        mModePreference.setOnPreferenceClickListener(preference -> {
+            mCapabilities = MagnificationCapabilities.getCapabilities(getPrefContext());
+            showDialog(DIALOG_MAGNIFICATION_CAPABILITY);
+            return true;
+        });
+    }
+
     private void callOnAlertDialogCheckboxClicked(DialogInterface dialog, int which) {
         updateCapabilities(true);
         mModePreference.setSummary(
-                getMagnificationCapabilitiesSummary(getPrefContext()));
+                MagnificationCapabilities.getSummary(getPrefContext(), mCapabilities));
     }
 
     private void onSwitchShortcutDialogPositiveButtonClicked(View view) {
@@ -209,11 +197,11 @@
         final View dialogWindowTextArea = dialogWidowView.findViewById(R.id.container);
         mMagnifyWindowCheckBox = dialogWidowView.findViewById(R.id.checkbox);
 
-        setTextAreasClickListener(dialogFullScreenTextArea, mMagnifyFullScreenCheckBox,
-                dialogWindowTextArea, mMagnifyWindowCheckBox);
-
         updateAlertDialogCheckState();
         updateAlertDialogEnableState(dialogFullScreenTextArea, dialogWindowTextArea);
+
+        setTextAreasClickListener(dialogFullScreenTextArea, mMagnifyFullScreenCheckBox,
+                dialogWindowTextArea, mMagnifyWindowCheckBox);
     }
 
     private void setTextAreasClickListener(View fullScreenTextArea, CheckBox fullScreenCheckBox,
@@ -285,7 +273,7 @@
                 ? Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW : 0;
         mCapabilities = capabilities;
         if (saveToDB) {
-            setMagnificationCapabilities(capabilities);
+            MagnificationCapabilities.setCapabilities(getPrefContext(), mCapabilities);
         }
     }
 
@@ -294,15 +282,6 @@
                 Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, OFF) == ON;
     }
 
-    private void setSecureIntValue(String key, int value) {
-        Settings.Secure.putIntForUser(getPrefContext().getContentResolver(),
-                key, value, getPrefContext().getContentResolver().getUserId());
-    }
-
-    private void setMagnificationCapabilities(int capabilities) {
-        setSecureIntValue(KEY_CAPABILITY, capabilities);
-    }
-
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider(R.xml.accessibility_magnification_service_settings);
 }
diff --git a/src/com/android/settings/accessibility/TextAndDisplayFragment.java b/src/com/android/settings/accessibility/TextAndDisplayFragment.java
new file mode 100644
index 0000000..b496e3d
--- /dev/null
+++ b/src/com/android/settings/accessibility/TextAndDisplayFragment.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2021 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.accessibility;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.hardware.display.ColorDisplayManager;
+import android.os.Bundle;
+import android.provider.Settings;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.display.DarkUIPreferenceController;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
+
+/** Accessibility settings for text and display. */
+@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
+public class TextAndDisplayFragment extends DashboardFragment {
+
+    private static final String TAG = "TextAndDisplayFragment";
+
+    private static final String CATEGORY_EXPERIMENTAL = "experimental_category";
+
+    // Preferences
+    private static final String DISPLAY_DALTONIZER_PREFERENCE_SCREEN = "daltonizer_preference";
+    private static final String TOGGLE_INVERSION_PREFERENCE = "toggle_inversion_preference";
+    private static final String DISPLAY_REDUCE_BRIGHT_COLORS_PREFERENCE_SCREEN =
+            "reduce_bright_colors_preference";
+    private static final String TOGGLE_DISABLE_ANIMATIONS = "toggle_disable_animations";
+    private static final String TOGGLE_LARGE_POINTER_ICON = "toggle_large_pointer_icon";
+
+    private Preference mDisplayDaltonizerPreferenceScreen;
+    private Preference mToggleInversionPreference;
+    private Preference mReduceBrightColorsPreference;
+    private SwitchPreference mToggleDisableAnimationsPreference;
+    private SwitchPreference mToggleLargePointerIconPreference;
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.ACCESSIBILITY_TEXT_AND_DISPLAY;
+    }
+
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        initializeAllPreferences();
+        updateSystemPreferences();
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        use(DarkUIPreferenceController.class).setParentFragment(this);
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.accessibility_text_and_display;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    private void initializeAllPreferences() {
+        // Display color adjustments.
+        mDisplayDaltonizerPreferenceScreen = findPreference(DISPLAY_DALTONIZER_PREFERENCE_SCREEN);
+
+        // Display inversion.
+        mToggleInversionPreference = findPreference(TOGGLE_INVERSION_PREFERENCE);
+
+        // Reduce brightness.
+        mReduceBrightColorsPreference =
+                findPreference(DISPLAY_REDUCE_BRIGHT_COLORS_PREFERENCE_SCREEN);
+
+        // Disable animation.
+        mToggleDisableAnimationsPreference = findPreference(TOGGLE_DISABLE_ANIMATIONS);
+
+        // Large pointer icon.
+        mToggleLargePointerIconPreference = findPreference(TOGGLE_LARGE_POINTER_ICON);
+    }
+
+    /**
+     * Updates preferences related to system configurations.
+     */
+    private void updateSystemPreferences() {
+        final PreferenceCategory experimentalCategory = getPreferenceScreen().findPreference(
+                CATEGORY_EXPERIMENTAL);
+        if (ColorDisplayManager.isColorTransformAccelerated(getContext())) {
+            mDisplayDaltonizerPreferenceScreen.setSummary(AccessibilityUtil.getSummary(
+                    getContext(), Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED));
+            mToggleInversionPreference.setSummary(AccessibilityUtil.getSummary(
+                    getContext(), Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED));
+            mReduceBrightColorsPreference.setSummary(AccessibilityUtil.getSummary(
+                    getContext(), Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED));
+            getPreferenceScreen().removePreference(experimentalCategory);
+        } else {
+            // Move following preferences to experimental category if device don't supports HWC
+            // hardware-accelerated color transform.
+            getPreferenceScreen().removePreference(mDisplayDaltonizerPreferenceScreen);
+            getPreferenceScreen().removePreference(mToggleInversionPreference);
+            getPreferenceScreen().removePreference(mReduceBrightColorsPreference);
+            getPreferenceScreen().removePreference(mToggleDisableAnimationsPreference);
+            getPreferenceScreen().removePreference(mToggleLargePointerIconPreference);
+            experimentalCategory.addPreference(mDisplayDaltonizerPreferenceScreen);
+            experimentalCategory.addPreference(mToggleInversionPreference);
+            experimentalCategory.addPreference(mReduceBrightColorsPreference);
+            experimentalCategory.addPreference(mToggleDisableAnimationsPreference);
+            experimentalCategory.addPreference(mToggleLargePointerIconPreference);
+        }
+    }
+
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.accessibility_text_and_display);
+}
diff --git a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceController.java b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceController.java
index b9af7ce..78f31df 100644
--- a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceController.java
+++ b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceController.java
@@ -25,6 +25,7 @@
 import android.provider.Settings;
 import android.util.ArrayMap;
 
+import androidx.annotation.VisibleForTesting;
 import androidx.lifecycle.LifecycleObserver;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
@@ -44,16 +45,23 @@
 public class ToggleAutoclickPreferenceController extends BasePreferenceController implements
         LifecycleObserver, RadioButtonPreference.OnClickListener, PreferenceControllerMixin {
 
-    private static final String CONTROL_AUTOCLICK_DELAY_SECURE =
+    @VisibleForTesting
+    static final String CONTROL_AUTOCLICK_DELAY_SECURE =
             Settings.Secure.ACCESSIBILITY_AUTOCLICK_DELAY;
-    private static final String KEY_AUTOCLICK_CUSTOM_SEEKBAR = "autoclick_custom_seekbar";
+
+    @VisibleForTesting
+    static final String KEY_AUTOCLICK_CUSTOM_SEEKBAR = "autoclick_custom_seekbar";
     static final String KEY_DELAY_MODE = "delay_mode";
 
-    private static final int AUTOCLICK_OFF_MODE = 0;
-    private static final int AUTOCLICK_CUSTOM_MODE = 2000;
+    @VisibleForTesting
+    static final int AUTOCLICK_OFF_MODE = 0;
+
+    @VisibleForTesting
+    static final int AUTOCLICK_CUSTOM_MODE = 2000;
 
     // Pair the preference key and autoclick mode value.
-    private final Map<String, Integer> mAccessibilityAutoclickKeyToValueMap = new ArrayMap<>();
+    @VisibleForTesting
+    Map<String, Integer> mAccessibilityAutoclickKeyToValueMap = new ArrayMap<>();
 
     private SharedPreferences mSharedPreferences;
     private final ContentResolver mContentResolver;
@@ -70,13 +78,7 @@
     private int mCurrentUiAutoClickMode;
 
     public ToggleAutoclickPreferenceController(Context context, String preferenceKey) {
-        super(context, preferenceKey);
-
-        mSharedPreferences = context.getSharedPreferences(context.getPackageName(), MODE_PRIVATE);
-        mContentResolver = context.getContentResolver();
-        mResources = context.getResources();
-
-        setAutoclickModeToKeyMap();
+        this(context, /* lifecycle= */ null, preferenceKey);
     }
 
     public ToggleAutoclickPreferenceController(Context context, Lifecycle lifecycle,
diff --git a/src/com/android/settings/accessibility/VideoPlayer.java b/src/com/android/settings/accessibility/VideoPlayer.java
index 8f94b76..d4aa6a6 100644
--- a/src/com/android/settings/accessibility/VideoPlayer.java
+++ b/src/com/android/settings/accessibility/VideoPlayer.java
@@ -25,6 +25,7 @@
 
 import androidx.annotation.GuardedBy;
 import androidx.annotation.RawRes;
+import androidx.annotation.VisibleForTesting;
 
 /**
  * Plays the video by {@link MediaPlayer} on {@link TextureView}, calls {@link #create(Context, int,
@@ -32,19 +33,25 @@
  * is no longer used, call {@link #release()} so that MediaPlayer object can be released.
  */
 public class VideoPlayer implements SurfaceTextureListener {
-    private final Context context;
-    private final Object mediaPlayerLock = new Object();
+    private final Context mContext;
+    private final Object mMediaPlayerLock = new Object();
     // Media player object can't be used after it has been released, so it will be set to null. But
     // VideoPlayer is asynchronized, media player object might be paused or resumed again before
     // released media player is set to null. Therefore, lock mediaPlayer and mediaPlayerState by
     // mediaPlayerLock keep their states consistent.
+    @VisibleForTesting
     @GuardedBy("mediaPlayerLock")
-    private MediaPlayer mediaPlayer;
+    MediaPlayer mMediaPlayer;
+
+    @VisibleForTesting
     @GuardedBy("mediaPlayerLock")
-    private State mediaPlayerState = State.NONE;
+    State mMediaPlayerState = State.NONE;
+
     @RawRes
-    private final int videoRes;
-    private Surface animationSurface;
+    private final int mVideoRes;
+
+    @VisibleForTesting
+    Surface mAnimationSurface;
 
 
     /**
@@ -58,54 +65,54 @@
     }
 
     private VideoPlayer(Context context, @RawRes int videoRes, TextureView textureView) {
-        this.context = context;
-        this.videoRes = videoRes;
+        this.mContext = context;
+        this.mVideoRes = videoRes;
         textureView.setSurfaceTextureListener(this);
     }
 
     public void pause() {
-        synchronized (mediaPlayerLock) {
-            if (mediaPlayerState == State.STARTED) {
-                mediaPlayerState = State.PAUSED;
-                mediaPlayer.pause();
+        synchronized (mMediaPlayerLock) {
+            if (mMediaPlayerState == State.STARTED) {
+                mMediaPlayerState = State.PAUSED;
+                mMediaPlayer.pause();
             }
         }
     }
 
     public void resume() {
-        synchronized (mediaPlayerLock) {
-            if (mediaPlayerState == State.PAUSED) {
-                mediaPlayer.start();
-                mediaPlayerState = State.STARTED;
+        synchronized (mMediaPlayerLock) {
+            if (mMediaPlayerState == State.PAUSED) {
+                mMediaPlayer.start();
+                mMediaPlayerState = State.STARTED;
             }
         }
     }
 
     /** Release media player when it's no longer needed. */
     public void release() {
-        synchronized (mediaPlayerLock) {
-            if (mediaPlayerState != State.NONE && mediaPlayerState != State.END) {
-                mediaPlayerState = State.END;
-                mediaPlayer.release();
-                mediaPlayer = null;
+        synchronized (mMediaPlayerLock) {
+            if (mMediaPlayerState != State.NONE && mMediaPlayerState != State.END) {
+                mMediaPlayerState = State.END;
+                mMediaPlayer.release();
+                mMediaPlayer = null;
             }
         }
-        if (animationSurface != null) {
-            animationSurface.release();
-            animationSurface = null;
+        if (mAnimationSurface != null) {
+            mAnimationSurface.release();
+            mAnimationSurface = null;
         }
     }
 
     @Override
     public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
-        animationSurface = new Surface(surface);
-        synchronized (mediaPlayerLock) {
-            mediaPlayer = MediaPlayer.create(context, videoRes);
-            mediaPlayerState = State.PREPARED;
-            mediaPlayer.setSurface(animationSurface);
-            mediaPlayer.setLooping(true);
-            mediaPlayer.start();
-            mediaPlayerState = State.STARTED;
+        mAnimationSurface = new Surface(surface);
+        synchronized (mMediaPlayerLock) {
+            mMediaPlayer = MediaPlayer.create(mContext, mVideoRes);
+            mMediaPlayerState = State.PREPARED;
+            mMediaPlayer.setSurface(mAnimationSurface);
+            mMediaPlayer.setLooping(true);
+            mMediaPlayer.start();
+            mMediaPlayerState = State.STARTED;
         }
     }
 
diff --git a/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java b/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java
index 5df30c2..5a1883b 100644
--- a/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java
+++ b/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java
@@ -14,9 +14,7 @@
 
 package com.android.settings.applications.appinfo;
 
-import android.app.role.RoleControllerManager;
 import android.app.role.RoleManager;
-import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.Intent;
 import android.os.UserManager;
@@ -58,14 +56,12 @@
 
         mRoleManager = context.getSystemService(RoleManager.class);
 
-        final RoleControllerManager roleControllerManager =
-                mContext.getSystemService(RoleControllerManager.class);
         final Executor executor = mContext.getMainExecutor();
-        roleControllerManager.isRoleVisible(mRoleName, executor, visible -> {
+        mRoleManager.isRoleVisible(mRoleName, executor, visible -> {
             mRoleVisible = visible;
             refreshAvailability();
         });
-        roleControllerManager.isApplicationVisibleForRole(mRoleName, mPackageName, executor,
+        mRoleManager.isApplicationVisibleForRole(mRoleName, mPackageName, executor,
                 visible -> {
                     mAppVisible = visible;
                     refreshAvailability();
diff --git a/src/com/android/settings/applications/specialaccess/notificationaccess/ApprovalPreferenceController.java b/src/com/android/settings/applications/specialaccess/notificationaccess/ApprovalPreferenceController.java
new file mode 100644
index 0000000..a43b9fd
--- /dev/null
+++ b/src/com/android/settings/applications/specialaccess/notificationaccess/ApprovalPreferenceController.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2020 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.specialaccess.notificationaccess;
+
+import android.app.NotificationManager;
+import android.app.settings.SettingsEnums;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.AsyncTask;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.overlay.FeatureFactory;
+
+public class ApprovalPreferenceController extends BasePreferenceController {
+
+    private static final String TAG = "ApprovalPrefController";
+
+    private PackageInfo mPkgInfo;
+    private ComponentName mCn;
+    private PreferenceFragmentCompat mParent;
+    private NotificationManager mNm;
+    private PackageManager mPm;
+
+    public ApprovalPreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    public ApprovalPreferenceController setPkgInfo(PackageInfo pkgInfo) {
+        mPkgInfo = pkgInfo;
+        return this;
+    }
+
+    public ApprovalPreferenceController setCn(ComponentName cn) {
+        mCn = cn;
+        return this;
+    }
+
+    public ApprovalPreferenceController setParent(PreferenceFragmentCompat parent) {
+        mParent = parent;
+        return this;
+    }
+
+    public ApprovalPreferenceController setNm(NotificationManager nm) {
+        mNm = nm;
+        return this;
+    }
+
+    public ApprovalPreferenceController setPm(PackageManager pm) {
+        mPm = pm;
+        return this;
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public void updateState(Preference pref) {
+        final SwitchPreference preference = (SwitchPreference) pref;
+        final CharSequence label = mPkgInfo.applicationInfo.loadLabel(mPm);
+        preference.setChecked(isServiceEnabled(mCn));
+        preference.setOnPreferenceChangeListener((p, newValue) -> {
+            final boolean access = (Boolean) newValue;
+            if (!access) {
+                if (!isServiceEnabled(mCn)) {
+                    return true; // already disabled
+                }
+                // show a friendly dialog
+                new FriendlyWarningDialogFragment()
+                        .setServiceInfo(mCn, label, mParent)
+                        .show(mParent.getFragmentManager(), "friendlydialog");
+                return false;
+            } else {
+                if (isServiceEnabled(mCn)) {
+                    return true; // already enabled
+                }
+                // show a scary dialog
+                new ScaryWarningDialogFragment()
+                        .setServiceInfo(mCn, label, mParent)
+                        .show(mParent.getFragmentManager(), "dialog");
+                return false;
+            }
+        });
+    }
+
+    public void disable(final ComponentName cn) {
+        logSpecialPermissionChange(true, cn.getPackageName());
+        mNm.setNotificationListenerAccessGranted(cn, false);
+        AsyncTask.execute(() -> {
+            if (!mNm.isNotificationPolicyAccessGrantedForPackage(
+                    cn.getPackageName())) {
+                mNm.removeAutomaticZenRules(cn.getPackageName());
+            }
+        });
+    }
+
+    protected void enable(ComponentName cn) {
+        logSpecialPermissionChange(true, cn.getPackageName());
+        mNm.setNotificationListenerAccessGranted(cn, true);
+    }
+
+    protected boolean isServiceEnabled(ComponentName cn) {
+        return mNm.isNotificationListenerAccessGranted(cn);
+    }
+
+    @VisibleForTesting
+    void logSpecialPermissionChange(boolean enable, String packageName) {
+        final int logCategory = enable ? SettingsEnums.APP_SPECIAL_PERMISSION_NOTIVIEW_ALLOW
+                : SettingsEnums.APP_SPECIAL_PERMISSION_NOTIVIEW_DENY;
+        FeatureFactory.getFactory(mContext).getMetricsFeatureProvider().action(mContext,
+                logCategory, packageName);
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/applications/specialaccess/notificationaccess/HeaderPreferenceController.java b/src/com/android/settings/applications/specialaccess/notificationaccess/HeaderPreferenceController.java
new file mode 100644
index 0000000..94736e4
--- /dev/null
+++ b/src/com/android/settings/applications/specialaccess/notificationaccess/HeaderPreferenceController.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2020 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.specialaccess.notificationaccess;
+
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.util.IconDrawableFactory;
+import android.view.View;
+
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.OnLifecycleEvent;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.widget.EntityHeaderController;
+import com.android.settingslib.applications.AppUtils;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.LayoutPreference;
+
+public class HeaderPreferenceController extends BasePreferenceController
+        implements PreferenceControllerMixin, LifecycleObserver {
+
+    private DashboardFragment mFragment;
+    private EntityHeaderController mHeaderController;
+    private PackageInfo mPackageInfo;
+    private PackageManager mPm;
+    private CharSequence mServiceName;
+
+    public HeaderPreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    public HeaderPreferenceController setFragment(DashboardFragment fragment) {
+        mFragment = fragment;
+        return this;
+    }
+
+    public HeaderPreferenceController setPackageInfo(PackageInfo packageInfo) {
+        mPackageInfo = packageInfo;
+        return this;
+    }
+
+    public HeaderPreferenceController setPm(PackageManager pm) {
+        mPm = pm;
+        return this;
+    }
+
+    public HeaderPreferenceController setServiceName(CharSequence serviceName) {
+        mServiceName = serviceName;
+        return this;
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        if (mFragment == null) {
+            return;
+        }
+        LayoutPreference pref = screen.findPreference(getPreferenceKey());
+        mHeaderController = EntityHeaderController.newInstance(
+                mFragment.getActivity(), mFragment, pref.findViewById(R.id.entity_header));
+        pref = mHeaderController
+                .setRecyclerView(mFragment.getListView(), mFragment.getSettingsLifecycle())
+                .setIcon(IconDrawableFactory.newInstance(mFragment.getActivity())
+                        .getBadgedIcon(mPackageInfo.applicationInfo))
+                .setLabel(mPackageInfo.applicationInfo.loadLabel(mPm))
+                .setSummary(mServiceName)
+                .setIsInstantApp(AppUtils.isInstant(mPackageInfo.applicationInfo))
+                .setPackageName(mPackageInfo.packageName)
+                .setUid(mPackageInfo.applicationInfo.uid)
+                .setHasAppInfoLink(true)
+                .setButtonActions(EntityHeaderController.ActionType.ACTION_NONE,
+                        EntityHeaderController.ActionType.ACTION_NONE)
+                .done(mFragment.getActivity(), mContext);
+        pref.findViewById(R.id.entity_header).setVisibility(View.VISIBLE);
+    }
+
+    @OnLifecycleEvent(Lifecycle.Event.ON_START)
+    public void onStart() {
+        if (mHeaderController != null) {
+            mHeaderController.styleActionBar(mFragment.getActivity());
+        }
+    }
+}
diff --git a/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java b/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java
index 58a6d7f..9f4b693 100644
--- a/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java
+++ b/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java
@@ -16,52 +16,55 @@
 
 package com.android.settings.applications.specialaccess.notificationaccess;
 
+import static com.android.settings.applications.AppInfoBase.ARG_PACKAGE_NAME;
+
 import android.app.Activity;
 import android.app.NotificationManager;
 import android.app.settings.SettingsEnums;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
-import android.os.AsyncTask;
 import android.os.Bundle;
+import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
 import android.service.notification.NotificationListenerService;
-import android.util.IconDrawableFactory;
 import android.util.Log;
 import android.util.Slog;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
+import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.applications.AppInfoBase;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.widget.EntityHeaderController;
-import com.android.settingslib.applications.AppUtils;
+import com.android.settings.SettingsActivity;
+import com.android.settings.applications.manageapplications.ManageApplications;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.notification.NotificationBackend;
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
 
 import java.util.List;
 import java.util.Objects;
 
-public class NotificationAccessDetails extends AppInfoBase {
+public class NotificationAccessDetails extends DashboardFragment {
     private static final String TAG = "NotifAccessDetails";
-    private static final String SWITCH_PREF_KEY = "notification_access_switch";
 
-    private boolean mCreated;
     private ComponentName mComponentName;
     private CharSequence mServiceName;
+    protected PackageInfo mPackageInfo;
+    protected int mUserId;
+    protected String mPackageName;
+    protected RestrictedLockUtils.EnforcedAdmin mAppsControlDisallowedAdmin;
+    protected boolean mAppsControlDisallowedBySystem;
     private boolean mIsNls;
-
-    private NotificationManager mNm;
     private PackageManager mPm;
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
+    public void onAttach(Context context) {
+        super.onAttach(context);
         final Intent intent = getIntent();
         if (mComponentName == null && intent != null) {
             String cn = intent.getStringExtra(Settings.EXTRA_NOTIFICATION_LISTENER_COMPONENT_NAME);
@@ -73,38 +76,24 @@
                 }
             }
         }
-        super.onCreate(savedInstanceState);
-        mNm = getContext().getSystemService(NotificationManager.class);
         mPm = getPackageManager();
-        addPreferencesFromResource(R.xml.notification_access_permission_details);
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-        if (mCreated) {
-            Log.w(TAG, "onActivityCreated: ignoring duplicate call");
-            return;
-        }
-        mCreated = true;
-        if (mPackageInfo == null) return;
+        retrieveAppEntry();
         loadNotificationListenerService();
-        final Activity activity = getActivity();
-        final Preference pref = EntityHeaderController
-                .newInstance(activity, this, null /* header */)
-                .setRecyclerView(getListView(), getSettingsLifecycle())
-                .setIcon(IconDrawableFactory.newInstance(getContext())
-                        .getBadgedIcon(mPackageInfo.applicationInfo))
-                .setLabel(mPackageInfo.applicationInfo.loadLabel(mPm))
-                .setSummary(mServiceName)
-                .setIsInstantApp(AppUtils.isInstant(mPackageInfo.applicationInfo))
-                .setPackageName(mPackageName)
-                .setUid(mPackageInfo.applicationInfo.uid)
-                .setHasAppInfoLink(true)
-                .setButtonActions(EntityHeaderController.ActionType.ACTION_NONE,
-                        EntityHeaderController.ActionType.ACTION_NONE)
-                .done(activity, getPrefContext());
-        getPreferenceScreen().addPreference(pref);
+        use(ApprovalPreferenceController.class)
+                .setPkgInfo(mPackageInfo)
+                .setCn(mComponentName)
+                .setNm(context.getSystemService(NotificationManager.class))
+                .setPm(context.getPackageManager())
+                .setParent(this);
+        use(HeaderPreferenceController.class)
+                .setFragment(this)
+                .setPackageInfo(mPackageInfo)
+                .setPm(context.getPackageManager())
+                .setServiceName(mServiceName);
+        use(TypeFilterPreferenceController.class)
+                .setNm(new NotificationBackend())
+                .setCn(mComponentName)
+                .setUserId(mUserId);
     }
 
     @Override
@@ -112,9 +101,7 @@
         return SettingsEnums.NOTIFICATION_ACCESS_DETAIL;
     }
 
-    @Override
     protected boolean refreshUi() {
-        final Context context = getContext();
         if (mComponentName == null) {
             // No service given
             Slog.d(TAG, "No component name provided");
@@ -130,72 +117,78 @@
             Slog.d(TAG, "NLSes aren't allowed in work profiles");
             return false;
         }
-        updatePreference(findPreference(SWITCH_PREF_KEY));
         return true;
     }
 
     @Override
-    protected AlertDialog createDialog(int id, int errorCode) {
-        return null;
+    public void onResume() {
+        super.onResume();
+        mAppsControlDisallowedAdmin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
+                getActivity(), UserManager.DISALLOW_APPS_CONTROL, mUserId);
+        mAppsControlDisallowedBySystem = RestrictedLockUtilsInternal.hasBaseUserRestriction(
+                getActivity(), UserManager.DISALLOW_APPS_CONTROL, mUserId);
+
+        if (!refreshUi()) {
+            setIntentAndFinish(true /* appChanged */);
+        }
     }
 
-    public void updatePreference(SwitchPreference preference) {
-        final CharSequence label = mPackageInfo.applicationInfo.loadLabel(mPm);
-        preference.setChecked(isServiceEnabled(mComponentName));
-        preference.setOnPreferenceChangeListener((p, newValue) -> {
-            final boolean access = (Boolean) newValue;
-            if (!access) {
-                if (!isServiceEnabled(mComponentName)) {
-                    return true; // already disabled
-                }
-                // show a friendly dialog
-                new FriendlyWarningDialogFragment()
-                        .setServiceInfo(mComponentName, label, this)
-                        .show(getFragmentManager(), "friendlydialog");
-                return false;
-            } else {
-                if (isServiceEnabled(mComponentName)) {
-                    return true; // already enabled
-                }
-                // show a scary dialog
-                new ScaryWarningDialogFragment()
-                        .setServiceInfo(mComponentName, label, this)
-                        .show(getFragmentManager(), "dialog");
-                return false;
+    protected void setIntentAndFinish(boolean appChanged) {
+        Log.i(TAG, "appChanged=" + appChanged);
+        Intent intent = new Intent();
+        intent.putExtra(ManageApplications.APP_CHG, appChanged);
+        SettingsActivity sa = (SettingsActivity) getActivity();
+        sa.finishPreferencePanel(Activity.RESULT_OK, intent);
+    }
+
+    protected void retrieveAppEntry() {
+        final Bundle args = getArguments();
+        mPackageName = (args != null) ? args.getString(ARG_PACKAGE_NAME) : null;
+        Intent intent = (args == null) ?
+                getIntent() : (Intent) args.getParcelable("intent");
+        if (mPackageName == null) {
+            if (intent != null && intent.getData() != null) {
+                mPackageName = intent.getData().getSchemeSpecificPart();
             }
-        });
+        }
+        if (intent != null && intent.hasExtra(Intent.EXTRA_USER_HANDLE)) {
+            mUserId = ((UserHandle) intent.getParcelableExtra(
+                    Intent.EXTRA_USER_HANDLE)).getIdentifier();
+        } else {
+            mUserId = UserHandle.myUserId();
+        }
+
+        try {
+            mPackageInfo = mPm.getPackageInfoAsUser(mPackageName,
+                    PackageManager.MATCH_DISABLED_COMPONENTS |
+                            PackageManager.GET_SIGNING_CERTIFICATES |
+                            PackageManager.GET_PERMISSIONS, mUserId);
+        } catch (PackageManager.NameNotFoundException e) {
+            Log.e(TAG, "Exception when retrieving package:" + mPackageName, e);
+        }
     }
 
-    @VisibleForTesting
-    void logSpecialPermissionChange(boolean enable, String packageName) {
-        int logCategory = enable ? SettingsEnums.APP_SPECIAL_PERMISSION_NOTIVIEW_ALLOW
-                : SettingsEnums.APP_SPECIAL_PERMISSION_NOTIVIEW_DENY;
-        FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider().action(getContext(),
-                logCategory, packageName);
-    }
-
+    // Dialogs only have access to the parent fragment, not the controller, so pass the information
+    // along to keep business logic out of this file
     public void disable(final ComponentName cn) {
-        logSpecialPermissionChange(true, cn.getPackageName());
-        mNm.setNotificationListenerAccessGranted(cn, false);
-        AsyncTask.execute(() -> {
-            if (!mNm.isNotificationPolicyAccessGrantedForPackage(
-                    cn.getPackageName())) {
-                mNm.removeAutomaticZenRules(cn.getPackageName());
-            }
-        });
-        refreshUi();
+        final PreferenceScreen screen = getPreferenceScreen();
+        ApprovalPreferenceController controller = use(ApprovalPreferenceController.class);
+        controller.disable(cn);
+        controller.updateState(screen.findPreference(controller.getPreferenceKey()));
+        TypeFilterPreferenceController dependent1 = use(TypeFilterPreferenceController.class);
+        dependent1.updateState(screen.findPreference(dependent1.getPreferenceKey()));
     }
 
     protected void enable(ComponentName cn) {
-        logSpecialPermissionChange(true, cn.getPackageName());
-        mNm.setNotificationListenerAccessGranted(cn, true);
-        refreshUi();
+        final PreferenceScreen screen = getPreferenceScreen();
+        ApprovalPreferenceController controller = use(ApprovalPreferenceController.class);
+        controller.enable(cn);
+        controller.updateState(screen.findPreference(controller.getPreferenceKey()));
+        TypeFilterPreferenceController dependent1 = use(TypeFilterPreferenceController.class);
+        dependent1.updateState(screen.findPreference(dependent1.getPreferenceKey()));
     }
 
-    protected boolean isServiceEnabled(ComponentName cn) {
-        return mNm.isNotificationListenerAccessGranted(cn);
-    }
-
+    // To save binder calls, load this in the fragment rather than each preference controller
     protected void loadNotificationListenerService() {
         mIsNls = false;
 
@@ -218,4 +211,14 @@
             }
         }
     }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.notification_access_permission_details;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/applications/specialaccess/notificationaccess/TypeFilterPreferenceController.java b/src/com/android/settings/applications/specialaccess/notificationaccess/TypeFilterPreferenceController.java
new file mode 100644
index 0000000..9d7fcc1
--- /dev/null
+++ b/src/com/android/settings/applications/specialaccess/notificationaccess/TypeFilterPreferenceController.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2021 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.specialaccess.notificationaccess;
+
+import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_ALERTING;
+import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_CONVERSATIONS;
+import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_ONGOING;
+import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_SILENT;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.service.notification.NotificationListenerFilter;
+
+import androidx.preference.MultiSelectListPreference;
+import androidx.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.notification.NotificationBackend;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class TypeFilterPreferenceController extends BasePreferenceController implements
+        PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
+
+    private static final String TAG = "TypeFilterPrefCntlr";
+
+    private ComponentName mCn;
+    private int mUserId;
+    private NotificationBackend mNm;
+    private NotificationListenerFilter mNlf;
+
+    public TypeFilterPreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    public TypeFilterPreferenceController setCn(ComponentName cn) {
+        mCn = cn;
+        return this;
+    }
+
+    public TypeFilterPreferenceController setUserId(int userId) {
+        mUserId = userId;
+        return this;
+    }
+
+    public TypeFilterPreferenceController setNm(NotificationBackend nm) {
+        mNm = nm;
+        return this;
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if (mNm.isNotificationListenerAccessGranted(mCn)) {
+            return AVAILABLE;
+        } else {
+            return DISABLED_DEPENDENT_SETTING;
+        }
+    }
+
+    @Override
+    public void updateState(Preference pref) {
+        mNlf = mNm.getListenerFilter(mCn, mUserId);
+        Set<String> values = new HashSet<>();
+        Set<String> entries = new HashSet<>();
+
+        if (hasFlag(mNlf.getTypes(), FLAG_FILTER_TYPE_ONGOING)) {
+            values.add(String.valueOf(FLAG_FILTER_TYPE_ONGOING));
+            entries.add(mContext.getString(R.string.notif_type_ongoing));
+        }
+        if (hasFlag(mNlf.getTypes(), FLAG_FILTER_TYPE_CONVERSATIONS)) {
+            values.add(String.valueOf(FLAG_FILTER_TYPE_CONVERSATIONS));
+            entries.add(mContext.getString(R.string.notif_type_conversation));
+        }
+        if (hasFlag(mNlf.getTypes(), FLAG_FILTER_TYPE_ALERTING)) {
+            values.add(String.valueOf(FLAG_FILTER_TYPE_ALERTING));
+            entries.add(mContext.getString(R.string.notif_type_alerting));
+        }
+        if (hasFlag(mNlf.getTypes(), FLAG_FILTER_TYPE_SILENT)) {
+            values.add(String.valueOf(FLAG_FILTER_TYPE_SILENT));
+            entries.add(mContext.getString(R.string.notif_type_silent));
+        }
+
+        final MultiSelectListPreference preference = (MultiSelectListPreference) pref;
+        preference.setValues(values);
+        super.updateState(preference);
+        pref.setEnabled(getAvailabilityStatus() == AVAILABLE);
+    }
+
+    private boolean hasFlag(int value, int flag) {
+        return (value & flag) != 0;
+    }
+
+    public CharSequence getSummary() {
+        Set<String> entries = new HashSet<>();
+        if (hasFlag(mNlf.getTypes(), FLAG_FILTER_TYPE_ONGOING)) {
+            entries.add(mContext.getString(R.string.notif_type_ongoing));
+        }
+        if (hasFlag(mNlf.getTypes(), FLAG_FILTER_TYPE_CONVERSATIONS)) {
+            entries.add(mContext.getString(R.string.notif_type_conversation));
+        }
+        if (hasFlag(mNlf.getTypes(), FLAG_FILTER_TYPE_ALERTING)) {
+            entries.add(mContext.getString(R.string.notif_type_alerting));
+        }
+        if (hasFlag(mNlf.getTypes(), FLAG_FILTER_TYPE_SILENT)) {
+            entries.add(mContext.getString(R.string.notif_type_silent));
+        }
+        return String.join(System.lineSeparator(), entries);
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        // retrieve latest in case the package filter has changed
+        mNlf = mNm.getListenerFilter(mCn, mUserId);
+
+        Set<String> set = (Set<String>) newValue;
+
+        int newFilter = 0;
+        for (String filterType : set) {
+            newFilter |= Integer.parseInt(filterType);
+        }
+        mNlf.setTypes(newFilter);
+        preference.setSummary(getSummary());
+        mNm.setListenerFilter(mCn, mUserId, mNlf);
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
index 234666f..dc0928a 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
@@ -109,6 +109,7 @@
                 FingerprintEnrollEnrolling.TAG_SIDECAR);
         if (mSidecar == null) {
             mSidecar = new FingerprintEnrollSidecar();
+            mSidecar.logMetrics(false);
             getSupportFragmentManager().beginTransaction()
                     .add(mSidecar, FingerprintEnrollEnrolling.TAG_SIDECAR)
                     .commitAllowingStateLoss();
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java
index cbd9d4d..73540c9 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java
@@ -19,7 +19,6 @@
 import android.app.Activity;
 import android.app.settings.SettingsEnums;
 import android.hardware.fingerprint.FingerprintManager;
-import android.os.UserHandle;
 
 import com.android.settings.Utils;
 import com.android.settings.biometrics.BiometricEnrollSidecar;
@@ -30,6 +29,7 @@
 public class FingerprintEnrollSidecar extends BiometricEnrollSidecar {
 
     private FingerprintManager mFingerprintManager;
+    private boolean mShouldLogMetrics = true;
 
     @Override
     public void onAttach(Activity activity) {
@@ -40,7 +40,18 @@
     @Override
     protected void startEnrollment() {
         super.startEnrollment();
-        mFingerprintManager.enroll(mToken, mEnrollmentCancel, mUserId, mEnrollmentCallback);
+        mFingerprintManager.enroll(mToken, mEnrollmentCancel, mUserId, mEnrollmentCallback,
+                mShouldLogMetrics);
+    }
+
+    /**
+     * Sets the flag mShouldLogMetrics which controls whether or not
+     * logging of enrollment successes/failures will be recorded for
+     * this particular instance of enrollment. This is primarily used by
+     * the find sensor activity so that false negatives are not reported.
+     */
+    public void logMetrics(boolean shouldLogMetrics) {
+        mShouldLogMetrics = shouldLogMetrics;
     }
 
     private FingerprintManager.EnrollmentCallback mEnrollmentCallback
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 25be4fa..2c21771 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -53,6 +53,7 @@
 import com.android.settings.applications.specialaccess.notificationaccess.NotificationAccessDetails;
 import com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureDetails;
 import com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureSettings;
+import com.android.settings.applications.specialaccess.premiumsms.PremiumSmsAccess;
 import com.android.settings.applications.specialaccess.vrlistener.VrListenerSettings;
 import com.android.settings.applications.specialaccess.zenaccess.ZenAccessDetails;
 import com.android.settings.backup.PrivacySettings;
@@ -270,6 +271,7 @@
             VrListenerSettings.class.getName(),
             PictureInPictureSettings.class.getName(),
             PictureInPictureDetails.class.getName(),
+            PremiumSmsAccess.class.getName(),
             ManagedProfileSettings.class.getName(),
             ChooseAccountFragment.class.getName(),
             IccLockSettings.class.getName(),
diff --git a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
index f8a4f39..2e326b0 100644
--- a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
+++ b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
@@ -29,6 +29,7 @@
 import com.android.settings.deviceinfo.StorageDashboardFragment;
 import com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment;
 import com.android.settings.display.NightDisplaySettings;
+import com.android.settings.emergency.EmergencyDashboardFragment;
 import com.android.settings.enterprise.EnterprisePrivacySettings;
 import com.android.settings.fuelgauge.PowerUsageSummary;
 import com.android.settings.fuelgauge.SmartBatterySettings;
@@ -81,6 +82,8 @@
                 CategoryKey.CATEGORY_BATTERY);
         PARENT_TO_CATEGORY_KEY_MAP.put(DisplaySettings.class.getName(),
                 CategoryKey.CATEGORY_DISPLAY);
+        PARENT_TO_CATEGORY_KEY_MAP.put(EmergencyDashboardFragment.class.getName(),
+                CategoryKey.CATEGORY_EMERGENCY);
         PARENT_TO_CATEGORY_KEY_MAP.put(SoundSettings.class.getName(),
                 CategoryKey.CATEGORY_SOUND);
         PARENT_TO_CATEGORY_KEY_MAP.put(StorageDashboardFragment.class.getName(),
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
index b755ba7..fe97759 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
@@ -21,6 +21,7 @@
 import android.content.SharedPreferences;
 
 import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
 
 /** Interface should be implemented if you have added new suggestions */
 public interface SuggestionFeatureProvider {
@@ -42,4 +43,9 @@
      * Returns the {@link SharedPreferences} that holds metadata for suggestions.
      */
     SharedPreferences getSharedPrefs(Context context);
+
+    /**
+     * Returns the class of {@link Fragment} that supports contextual suggestion.
+     */
+    Class<? extends Fragment> getContextualSuggestionFragment();
 }
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
index 60a8c54..deb1c7e 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
@@ -22,6 +22,7 @@
 import android.content.SharedPreferences;
 
 import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
 
 import com.android.settings.Settings.NightDisplaySuggestionActivity;
 import com.android.settings.biometrics.fingerprint.FingerprintEnrollSuggestionActivity;
@@ -86,6 +87,11 @@
         return context.getSharedPreferences(SHARED_PREF_FILENAME, Context.MODE_PRIVATE);
     }
 
+    @Override
+    public Class<? extends Fragment> getContextualSuggestionFragment() {
+        return null;
+    }
+
     public SuggestionFeatureProviderImpl(Context context) {
         final Context appContext = context.getApplicationContext();
         mMetricsFeatureProvider = FeatureFactory.getFactory(appContext)
diff --git a/src/com/android/settings/development/WirelessDebuggingPreferenceController.java b/src/com/android/settings/development/WirelessDebuggingPreferenceController.java
index 592028c..2d4e889 100644
--- a/src/com/android/settings/development/WirelessDebuggingPreferenceController.java
+++ b/src/com/android/settings/development/WirelessDebuggingPreferenceController.java
@@ -20,7 +20,8 @@
 import android.database.ContentObserver;
 import android.debug.IAdbManager;
 import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
+import android.net.Network;
+import android.net.NetworkCapabilities;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.Looper;
@@ -141,10 +142,16 @@
     public static boolean isWifiConnected(Context context) {
         ConnectivityManager cm = (ConnectivityManager) context.getSystemService(
                 Context.CONNECTIVITY_SERVICE);
-        if (cm != null) {
-            NetworkInfo info = cm.getActiveNetworkInfo();
-            if (info != null && info.isConnected()) {
-                return info.getType() == ConnectivityManager.TYPE_WIFI;
+        if (cm == null) {
+            return false;
+        }
+        for (Network network : cm.getAllNetworks()) {
+            final NetworkCapabilities nc = cm.getNetworkCapabilities(network);
+            if (nc == null) {
+                continue;
+            }
+            if (nc.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)) {
+                return true;
             }
         }
         return false;
diff --git a/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceController.java b/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceController.java
index 955c60c..e5fd3da 100644
--- a/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceController.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.os.SystemProperties;
+import android.text.TextUtils;
 
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
@@ -31,8 +32,8 @@
 
     @Override
     public int getAvailabilityStatus() {
-        return mContext.getResources().getBoolean(R.bool.config_show_device_model)
-                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+        return mContext.getResources().getBoolean(R.bool.config_show_device_model) &&
+                !TextUtils.isEmpty(getSummary()) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/display/NightDisplayPreference.java b/src/com/android/settings/display/NightDisplayPreference.java
deleted file mode 100644
index 7020c49..0000000
--- a/src/com/android/settings/display/NightDisplayPreference.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2016 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 android.content.Context;
-import android.hardware.display.ColorDisplayManager;
-import android.hardware.display.NightDisplayListener;
-import android.util.AttributeSet;
-
-import androidx.preference.SwitchPreference;
-
-import java.time.LocalTime;
-
-public class NightDisplayPreference extends SwitchPreference
-        implements NightDisplayListener.Callback {
-
-    private ColorDisplayManager mColorDisplayManager;
-    private NightDisplayListener mNightDisplayListener;
-    private NightDisplayTimeFormatter mTimeFormatter;
-
-    public NightDisplayPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-
-        mColorDisplayManager = context.getSystemService(ColorDisplayManager.class);
-        mNightDisplayListener = new NightDisplayListener(context);
-        mTimeFormatter = new NightDisplayTimeFormatter(context);
-    }
-
-    @Override
-    public void onAttached() {
-        super.onAttached();
-
-        // Listen for changes only while attached.
-        mNightDisplayListener.setCallback(this);
-
-        // Update the summary since the state may have changed while not attached.
-        updateSummary();
-    }
-
-    @Override
-    public void onDetached() {
-        super.onDetached();
-
-        // Stop listening for state changes.
-        mNightDisplayListener.setCallback(null);
-    }
-
-    @Override
-    public void onActivated(boolean activated) {
-        updateSummary();
-    }
-
-    @Override
-    public void onAutoModeChanged(int autoMode) {
-        updateSummary();
-    }
-
-    @Override
-    public void onCustomStartTimeChanged(LocalTime startTime) {
-        updateSummary();
-    }
-
-    @Override
-    public void onCustomEndTimeChanged(LocalTime endTime) {
-        updateSummary();
-    }
-
-    private void updateSummary() {
-        setSummary(mTimeFormatter.getAutoModeTimeSummary(getContext(), mColorDisplayManager));
-    }
-}
diff --git a/src/com/android/settings/display/NightDisplayPreferenceController.java b/src/com/android/settings/display/NightDisplayPreferenceController.java
index 6891d65..003373c 100644
--- a/src/com/android/settings/display/NightDisplayPreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayPreferenceController.java
@@ -15,18 +15,33 @@
 
 import android.content.Context;
 import android.hardware.display.ColorDisplayManager;
+import android.hardware.display.NightDisplayListener;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settings.core.TogglePreferenceController;
+import com.android.settings.widget.PrimarySwitchPreference;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
 
-public class NightDisplayPreferenceController extends AbstractPreferenceController implements
-        PreferenceControllerMixin {
+/** A controller can control the behavior of night display setting. */
+public class NightDisplayPreferenceController extends TogglePreferenceController
+        implements NightDisplayListener.Callback, LifecycleObserver, OnStart, OnStop {
 
-    private static final String KEY_NIGHT_DISPLAY = "night_display";
+    private final ColorDisplayManager mColorDisplayManager;
+    private final NightDisplayListener mNightDisplayListener;
+    private final NightDisplayTimeFormatter mTimeFormatter;
+    private PrimarySwitchPreference mPreference;
 
-    public NightDisplayPreferenceController(Context context) {
-        super(context);
+    public NightDisplayPreferenceController(Context context, String key) {
+        super(context, key);
+
+        mColorDisplayManager = context.getSystemService(ColorDisplayManager.class);
+        mNightDisplayListener = new NightDisplayListener(context);
+        mTimeFormatter = new NightDisplayTimeFormatter(context);
     }
 
     public static boolean isSuggestionComplete(Context context) {
@@ -41,12 +56,47 @@
     }
 
     @Override
-    public boolean isAvailable() {
-        return ColorDisplayManager.isNightDisplayAvailable(mContext);
+    public void onStart() {
+        // Listen for changes only while attached.
+        mNightDisplayListener.setCallback(this);
     }
 
     @Override
-    public String getPreferenceKey() {
-        return KEY_NIGHT_DISPLAY;
+    public void onStop() {
+        // Stop listening for state changes.
+        mNightDisplayListener.setCallback(null);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return ColorDisplayManager.isNightDisplayAvailable(mContext)
+                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return mColorDisplayManager.isNightDisplayActivated();
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        return mColorDisplayManager.setNightDisplayActivated(isChecked);
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        preference.setSummary(mTimeFormatter.getAutoModeSummary(mContext, mColorDisplayManager));
+    }
+
+    @Override
+    public void onActivated(boolean activated) {
+        updateState(mPreference);
     }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/display/NightDisplayTimeFormatter.java b/src/com/android/settings/display/NightDisplayTimeFormatter.java
index 1449ac1..aa715de 100644
--- a/src/com/android/settings/display/NightDisplayTimeFormatter.java
+++ b/src/com/android/settings/display/NightDisplayTimeFormatter.java
@@ -17,8 +17,8 @@
 package com.android.settings.display;
 
 import android.content.Context;
-
 import android.hardware.display.ColorDisplayManager;
+
 import com.android.settings.R;
 
 import java.text.DateFormat;
@@ -45,13 +45,6 @@
         return mTimeFormatter.format(c.getTime());
     }
 
-    public String getAutoModeTimeSummary(Context context, ColorDisplayManager manager) {
-        final int summaryFormatResId =
-                manager.isNightDisplayActivated() ? R.string.night_display_summary_on
-                        : R.string.night_display_summary_off;
-        return context.getString(summaryFormatResId, getAutoModeSummary(context, manager));
-    }
-
     public String getAutoModeSummary(Context context, ColorDisplayManager manager) {
         final boolean isActivated = manager.isNightDisplayActivated();
         final int autoMode = manager.getNightDisplayAutoMode();
diff --git a/src/com/android/settings/display/ScreenTimeoutSettings.java b/src/com/android/settings/display/ScreenTimeoutSettings.java
index 83f904a..a90c886 100644
--- a/src/com/android/settings/display/ScreenTimeoutSettings.java
+++ b/src/com/android/settings/display/ScreenTimeoutSettings.java
@@ -37,13 +37,13 @@
 import com.android.settings.support.actionbar.HelpMenuController;
 import com.android.settings.support.actionbar.HelpResourceProvider;
 import com.android.settings.widget.RadioButtonPickerFragment;
-import com.android.settings.widget.RadioButtonPreferenceWithExtraWidget;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtilsInternal;
 import com.android.settingslib.search.SearchIndexable;
 import com.android.settingslib.search.SearchIndexableRaw;
 import com.android.settingslib.widget.CandidateInfo;
 import com.android.settingslib.widget.FooterPreference;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 import com.google.common.annotations.VisibleForTesting;
 
@@ -152,8 +152,8 @@
         }
 
         for (CandidateInfo info : candidateList) {
-            RadioButtonPreferenceWithExtraWidget pref =
-                    new RadioButtonPreferenceWithExtraWidget(getPrefContext());
+            RadioButtonPreference pref =
+                    new RadioButtonPreference(getPrefContext());
             bindPreference(pref, info.getKey(), info, defaultKey);
             screen.addPreference(pref);
         }
diff --git a/src/com/android/settings/display/TopLevelWallpaperPreferenceController.java b/src/com/android/settings/display/TopLevelWallpaperPreferenceController.java
new file mode 100644
index 0000000..beef4f3
--- /dev/null
+++ b/src/com/android/settings/display/TopLevelWallpaperPreferenceController.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2020 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 android.os.UserManager.DISALLOW_SET_WALLPAPER;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.UserHandle;
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.RestrictedLockUtilsInternal;
+import com.android.settingslib.RestrictedTopLevelPreference;
+
+import java.util.List;
+
+/** This controller manages the wallpaper preference of the top level page. */
+public class TopLevelWallpaperPreferenceController extends BasePreferenceController {
+    private static final String TAG = "TopLevelWallpaperPreferenceController";
+    private static final String LAUNCHED_SETTINGS = "app_launched_settings";
+
+    private final String mWallpaperPackage;
+    private final String mWallpaperClass;
+    private final String mStylesAndWallpaperClass;
+    private final String mWallpaperLaunchExtra;
+
+    public TopLevelWallpaperPreferenceController(Context context, String key) {
+        super(context, key);
+        mWallpaperPackage = mContext.getString(R.string.config_wallpaper_picker_package);
+        mWallpaperClass = mContext.getString(R.string.config_wallpaper_picker_class);
+        mStylesAndWallpaperClass =
+                mContext.getString(R.string.config_styles_and_wallpaper_picker_class);
+        mWallpaperLaunchExtra = mContext.getString(R.string.config_wallpaper_picker_launch_extra);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        Preference preference = screen.findPreference(getPreferenceKey());
+        preference.setTitle(getTitle());
+    }
+
+    public String getTitle() {
+        return mContext.getString(areStylesAvailable()
+                ? R.string.style_and_wallpaper_settings_title : R.string.wallpaper_settings_title);
+    }
+
+    public ComponentName getComponentName() {
+        return new ComponentName(mWallpaperPackage, getComponentClassString());
+    }
+
+    public String getComponentClassString() {
+        return areStylesAvailable() ? mStylesAndWallpaperClass : mWallpaperClass;
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if ((TextUtils.isEmpty(mWallpaperClass) && TextUtils.isEmpty(mStylesAndWallpaperClass))
+                || TextUtils.isEmpty(mWallpaperPackage)) {
+            Log.e(TAG, "No Wallpaper picker specified!");
+            return UNSUPPORTED_ON_DEVICE;
+        }
+        return canResolveWallpaperComponent(getComponentClassString())
+                ? AVAILABLE_UNSEARCHABLE : CONDITIONALLY_UNAVAILABLE;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        disablePreferenceIfManaged((RestrictedTopLevelPreference) preference);
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (getPreferenceKey().equals(preference.getKey())) {
+            final Intent intent = new Intent().setComponent(
+                    getComponentName()).putExtra(mWallpaperLaunchExtra, LAUNCHED_SETTINGS);
+            if (areStylesAvailable()) {
+                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            }
+            preference.getContext().startActivity(intent);
+            return true;
+        }
+        return super.handlePreferenceTreeClick(preference);
+    }
+
+    /** Returns whether Styles & Wallpaper is enabled and available. */
+    public boolean areStylesAvailable() {
+        return !TextUtils.isEmpty(mStylesAndWallpaperClass)
+                && canResolveWallpaperComponent(mStylesAndWallpaperClass);
+    }
+
+    private boolean canResolveWallpaperComponent(String className) {
+        final ComponentName componentName = new ComponentName(mWallpaperPackage, className);
+        final PackageManager pm = mContext.getPackageManager();
+        final Intent intent = new Intent().setComponent(componentName);
+        final List<ResolveInfo> resolveInfos = pm.queryIntentActivities(intent, 0 /* flags */);
+        return resolveInfos != null && !resolveInfos.isEmpty();
+    }
+
+    private void disablePreferenceIfManaged(RestrictedTopLevelPreference pref) {
+        final String restriction = DISALLOW_SET_WALLPAPER;
+        if (pref != null) {
+            pref.setDisabledByAdmin(null);
+            if (RestrictedLockUtilsInternal.hasBaseUserRestriction(mContext,
+                    restriction, UserHandle.myUserId())) {
+                // Do not show the admin dialog for system restriction.
+                pref.setEnabled(false);
+            } else {
+                pref.checkRestrictionAndSetDisabled(restriction);
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/display/darkmode/DarkModePreference.java b/src/com/android/settings/display/darkmode/DarkModePreference.java
index baaa1f7..c69bb01 100644
--- a/src/com/android/settings/display/darkmode/DarkModePreference.java
+++ b/src/com/android/settings/display/darkmode/DarkModePreference.java
@@ -74,10 +74,10 @@
             return;
         }
         final int mode = mUiModeManager.getNightMode();
-        String detail;
+        String summary;
 
         if (mode == UiModeManager.MODE_NIGHT_AUTO) {
-            detail = getContext().getString(active
+            summary = getContext().getString(active
                     ? R.string.dark_ui_summary_on_auto_mode_auto
                     : R.string.dark_ui_summary_off_auto_mode_auto);
         } else if (mode == UiModeManager.MODE_NIGHT_CUSTOM) {
@@ -85,17 +85,14 @@
                     ? mUiModeManager.getCustomNightModeEnd()
                     : mUiModeManager.getCustomNightModeStart();
             final String timeStr = mFormat.of(time);
-            detail = getContext().getString(active
+            summary = getContext().getString(active
                     ? R.string.dark_ui_summary_on_auto_mode_custom
                     : R.string.dark_ui_summary_off_auto_mode_custom, timeStr);
         } else {
-            detail = getContext().getString(active
+            summary = getContext().getString(active
                     ? R.string.dark_ui_summary_on_auto_mode_never
                     : R.string.dark_ui_summary_off_auto_mode_never);
         }
-        String summary = getContext().getString(active
-                ? R.string.dark_ui_summary_on
-                : R.string.dark_ui_summary_off, detail);
 
         setSummary(summary);
     }
diff --git a/src/com/android/settings/emergency/EmergencyDashboardFragment.java b/src/com/android/settings/emergency/EmergencyDashboardFragment.java
new file mode 100644
index 0000000..c786767
--- /dev/null
+++ b/src/com/android/settings/emergency/EmergencyDashboardFragment.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2021 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.emergency;
+
+import android.app.settings.SettingsEnums;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
+
+
+/**
+ * {@link DashboardFragment} that hosts emergency/safety related settings.
+ */
+@SearchIndexable
+public class EmergencyDashboardFragment extends DashboardFragment {
+
+    private static final String TAG = "EmergencyDashboard";
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.emergency_settings;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.EMERGENCY_SOS_GESTURE_SETTINGS;
+    }
+
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.emergency_settings);
+}
diff --git a/src/com/android/settings/emergency/OWNERS b/src/com/android/settings/emergency/OWNERS
new file mode 100644
index 0000000..5707f87
--- /dev/null
+++ b/src/com/android/settings/emergency/OWNERS
@@ -0,0 +1 @@
+zhfan@google.com
\ No newline at end of file
diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
index 9066444..11d7564 100644
--- a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
@@ -52,7 +52,8 @@
  * Controller that update the battery header view
  */
 public class BatteryHeaderPreferenceController extends BasePreferenceController
-        implements PreferenceControllerMixin, LifecycleObserver, OnStart {
+        implements PreferenceControllerMixin, LifecycleObserver, OnStart,
+        BatteryPreferenceController {
     @VisibleForTesting
     static final String KEY_BATTERY_HEADER = "battery_header";
     private static final String ANNOTATION_URL = "url";
@@ -121,16 +122,20 @@
                 .styleActionBar(mActivity);
     }
 
+    private CharSequence generateLabel(BatteryInfo info) {
+        if (BatteryUtils.isBatteryDefenderOn(info)) {
+            return null;
+        } else if (info.remainingLabel == null) {
+            return info.statusLabel;
+        } else {
+            return info.remainingLabel;
+        }
+    }
+
     public void updateHeaderPreference(BatteryInfo info) {
         mBatteryPercentText.setText(formatBatteryPercentageText(info.batteryLevel));
         if (!mBatteryStatusFeatureProvider.triggerBatteryStatusUpdate(this, info)) {
-            if (BatteryUtils.isBatteryDefenderOn(info)) {
-                mSummary1.setText(null);
-            } else if (info.remainingLabel == null) {
-                mSummary1.setText(info.statusLabel);
-            } else {
-                mSummary1.setText(info.remainingLabel);
-            }
+            mSummary1.setText(generateLabel(info));
         }
 
         mBatteryMeterView.setBatteryLevel(info.batteryLevel);
@@ -141,8 +146,8 @@
     /**
      * Callback which receives text for the summary line.
      */
-    public void updateBatteryStatus(String statusLabel) {
-        mSummary1.setText(statusLabel);
+    public void updateBatteryStatus(String label, BatteryInfo info) {
+        mSummary1.setText(label != null ? label : generateLabel(info));
     }
 
     public void quickUpdateHeaderPreference() {
diff --git a/src/com/android/settings/fuelgauge/BatteryPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryPreferenceController.java
new file mode 100644
index 0000000..badf5c8
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/BatteryPreferenceController.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2020 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.fuelgauge;
+
+/**
+ * Common interface for a preference controller that updates battery status
+ */
+public interface BatteryPreferenceController {
+
+    /**
+     * Updates the label for the preference controller. If the label is null, the
+     * implementation should revert back to the original label based on the
+     * battery info.
+     */
+    void updateBatteryStatus(String label, BatteryInfo info);
+}
diff --git a/src/com/android/settings/fuelgauge/BatteryStatusFeatureProvider.java b/src/com/android/settings/fuelgauge/BatteryStatusFeatureProvider.java
index c3fc247..46f00c7 100644
--- a/src/com/android/settings/fuelgauge/BatteryStatusFeatureProvider.java
+++ b/src/com/android/settings/fuelgauge/BatteryStatusFeatureProvider.java
@@ -25,5 +25,5 @@
      * Trigger a battery status update; return false if built-in status should be used.
      */
     boolean triggerBatteryStatusUpdate(
-            BatteryHeaderPreferenceController batteryHeaderPreferenceController, BatteryInfo info);
+            BatteryPreferenceController controller, BatteryInfo info);
 }
diff --git a/src/com/android/settings/fuelgauge/BatteryStatusFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/BatteryStatusFeatureProviderImpl.java
index 47d376d..dc4b5db 100644
--- a/src/com/android/settings/fuelgauge/BatteryStatusFeatureProviderImpl.java
+++ b/src/com/android/settings/fuelgauge/BatteryStatusFeatureProviderImpl.java
@@ -31,7 +31,7 @@
 
     @Override
     public boolean triggerBatteryStatusUpdate(
-            BatteryHeaderPreferenceController batteryHeaderPreferenceController, BatteryInfo info) {
+            BatteryPreferenceController controller, BatteryInfo info) {
         return false;
     }
 }
diff --git a/src/com/android/settings/fuelgauge/FakeUid.java b/src/com/android/settings/fuelgauge/FakeUid.java
index c592f51..309f259 100644
--- a/src/com/android/settings/fuelgauge/FakeUid.java
+++ b/src/com/android/settings/fuelgauge/FakeUid.java
@@ -356,6 +356,11 @@
     }
 
     @Override
+    public long getScreenOnEnergy() {
+        return 0;
+    }
+
+    @Override
     public long getMobileRadioApWakeupCount(int which) {
         return 0;
     }
diff --git a/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java b/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java
index c2e6a6f..1912c2f 100644
--- a/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java
@@ -26,18 +26,21 @@
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.core.FeatureFlags;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
 
 public class TopLevelBatteryPreferenceController extends BasePreferenceController implements
-        LifecycleObserver, OnStart, OnStop {
+        LifecycleObserver, OnStart, OnStop, BatteryPreferenceController {
 
     @VisibleForTesting
-    boolean mIsBatteryPresent = true;
+    protected boolean mIsBatteryPresent = true;
     private final BatteryBroadcastReceiver mBatteryBroadcastReceiver;
     private Preference mPreference;
     private BatteryInfo mBatteryInfo;
+    private BatteryStatusFeatureProvider mBatteryStatusFeatureProvider;
+    private String mBatteryStatusLabel;
 
     public TopLevelBatteryPreferenceController(Context context, String preferenceKey) {
         super(context, preferenceKey);
@@ -51,6 +54,9 @@
                 updateState(mPreference);
             }, true /* shortString */);
         });
+
+        mBatteryStatusFeatureProvider = FeatureFactory.getFactory(context)
+                .getBatteryStatusFeatureProvider(context);
     }
 
     @Override
@@ -77,6 +83,10 @@
 
     @Override
     public CharSequence getSummary() {
+        return getSummary(true /* batteryStatusUpdate */);
+    }
+
+    private CharSequence getSummary(boolean batteryStatusUpdate) {
         // Remove homepage summaries for silky home.
         if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
             return null;
@@ -85,23 +95,48 @@
         if (!mIsBatteryPresent) {
             return mContext.getText(R.string.battery_missing_message);
         }
-        return getDashboardLabel(mContext, mBatteryInfo);
+        return getDashboardLabel(mContext, mBatteryInfo, batteryStatusUpdate);
     }
 
-    static CharSequence getDashboardLabel(Context context, BatteryInfo info) {
+    protected CharSequence getDashboardLabel(Context context, BatteryInfo info,
+            boolean batteryStatusUpdate) {
         if (info == null || context == null) {
             return null;
         }
-        CharSequence label;
+
+        if (batteryStatusUpdate) {
+            if (!mBatteryStatusFeatureProvider.triggerBatteryStatusUpdate(this, info)) {
+                mBatteryStatusLabel = null; // will generateLabel()
+            }
+        }
+
+        return (mBatteryStatusLabel == null) ? generateLabel(info) : mBatteryStatusLabel;
+    }
+
+    private CharSequence generateLabel(BatteryInfo info) {
         if (!info.discharging && info.chargeLabel != null) {
-            label = info.chargeLabel;
+            return info.chargeLabel;
         } else if (info.remainingLabel == null) {
-            label = info.batteryPercentString;
+            return info.batteryPercentString;
         } else {
-            label = context.getString(R.string.power_remaining_settings_home_page,
+            return mContext.getString(R.string.power_remaining_settings_home_page,
                     info.batteryPercentString,
                     info.remainingLabel);
         }
-        return label;
+    }
+
+    /**
+     * Callback which receives text for the label.
+     */
+    public void updateBatteryStatus(String label, BatteryInfo info) {
+        mBatteryStatusLabel = label; // Null if adaptive charging is not active
+
+        if (mPreference != null) {
+            // Do not triggerBatteryStatusUpdate(), otherwise there will be an infinite loop
+            final CharSequence summary = getSummary(false /* batteryStatusUpdate */);
+            if (summary != null) {
+                mPreference.setSummary(summary);
+            }
+        }
     }
 }
diff --git a/src/com/android/settings/gestures/EmergencyGestureNumberOverridePreference.java b/src/com/android/settings/gestures/EmergencyGestureNumberOverridePreference.java
index d481b2e..6e0a6a7 100644
--- a/src/com/android/settings/gestures/EmergencyGestureNumberOverridePreference.java
+++ b/src/com/android/settings/gestures/EmergencyGestureNumberOverridePreference.java
@@ -20,7 +20,6 @@
 
 import android.content.Context;
 import android.content.DialogInterface;
-import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
@@ -91,11 +90,9 @@
         if (which == BUTTON_POSITIVE) {
             final String input = mEditText.getText().toString();
             if (!TextUtils.isEmpty(input)) {
-                Settings.Secure.putString(getContext().getContentResolver(),
-                        Settings.Secure.EMERGENCY_GESTURE_CALL_NUMBER, input);
+                mEmergencyNumberUtils.setEmergencyNumberOverride(input);
             } else {
-                Settings.Secure.putString(getContext().getContentResolver(),
-                        Settings.Secure.EMERGENCY_GESTURE_CALL_NUMBER,
+                mEmergencyNumberUtils.setEmergencyNumberOverride(
                         mEmergencyNumberUtils.getDefaultPoliceNumber());
             }
         }
diff --git a/src/com/android/settings/gestures/EmergencyGestureNumberOverridePreferenceController.java b/src/com/android/settings/gestures/EmergencyGestureNumberOverridePreferenceController.java
index 28e4154..ecbd9c7 100644
--- a/src/com/android/settings/gestures/EmergencyGestureNumberOverridePreferenceController.java
+++ b/src/com/android/settings/gestures/EmergencyGestureNumberOverridePreferenceController.java
@@ -16,11 +16,12 @@
 
 package com.android.settings.gestures;
 
+import static com.android.settingslib.emergencynumber.EmergencyNumberUtils.EMERGENCY_NUMBER_OVERRIDE_AUTHORITY;
+
 import android.content.Context;
 import android.database.ContentObserver;
 import android.os.Handler;
 import android.os.Looper;
-import android.provider.Settings;
 import android.telephony.PhoneNumberUtils;
 import android.text.Spannable;
 
@@ -86,8 +87,8 @@
 
     @Override
     public void onStart() {
-        mContext.getContentResolver().registerContentObserver(Settings.Secure.getUriFor(
-                Settings.Secure.EMERGENCY_GESTURE_CALL_NUMBER), false, mSettingsObserver);
+        mContext.getContentResolver().registerContentObserver(EMERGENCY_NUMBER_OVERRIDE_AUTHORITY,
+                false, mSettingsObserver);
     }
 
     @Override
diff --git a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
index bed14a8..ddcdd59 100644
--- a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
+++ b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
@@ -21,9 +21,6 @@
 import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY;
 import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY;
 
-import static com.android.settings.widget.RadioButtonPreferenceWithExtraWidget.EXTRA_WIDGET_VISIBILITY_GONE;
-import static com.android.settings.widget.RadioButtonPreferenceWithExtraWidget.EXTRA_WIDGET_VISIBILITY_SETTING;
-
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.Intent;
@@ -49,7 +46,6 @@
 import com.android.settings.support.actionbar.HelpResourceProvider;
 import com.android.settings.utils.CandidateInfoExtra;
 import com.android.settings.widget.RadioButtonPickerFragment;
-import com.android.settings.widget.RadioButtonPreferenceWithExtraWidget;
 import com.android.settings.widget.VideoPreference;
 import com.android.settingslib.search.SearchIndexable;
 import com.android.settingslib.widget.CandidateInfo;
@@ -119,8 +115,8 @@
             return;
         }
         for (CandidateInfo info : candidateList) {
-            RadioButtonPreferenceWithExtraWidget pref =
-                    new RadioButtonPreferenceWithExtraWidget(getPrefContext());
+            RadioButtonPreference pref =
+                    new RadioButtonPreference(getPrefContext());
             bindPreference(pref, info.getKey(), info, defaultKey);
             bindPreferenceExtra(pref, info.getKey(), info, defaultKey, systemDefaultKey);
             screen.addPreference(pref);
@@ -131,20 +127,15 @@
     @Override
     public void bindPreferenceExtra(RadioButtonPreference pref,
             String key, CandidateInfo info, String defaultKey, String systemDefaultKey) {
-        if (!(info instanceof CandidateInfoExtra)
-                || !(pref instanceof RadioButtonPreferenceWithExtraWidget)) {
+        if (!(info instanceof CandidateInfoExtra)) {
             return;
         }
 
         pref.setSummary(((CandidateInfoExtra) info).loadSummary());
 
-        RadioButtonPreferenceWithExtraWidget p = (RadioButtonPreferenceWithExtraWidget) pref;
         if (info.getKey() == KEY_SYSTEM_NAV_GESTURAL) {
-            p.setExtraWidgetVisibility(EXTRA_WIDGET_VISIBILITY_SETTING);
-            p.setExtraWidgetOnClickListener((v) -> startActivity(new Intent(
+            pref.setExtraWidgetOnClickListener((v) -> startActivity(new Intent(
                     GestureNavigationSettingsFragment.GESTURE_NAVIGATION_SETTINGS)));
-        } else {
-            p.setExtraWidgetVisibility(EXTRA_WIDGET_VISIBILITY_GONE);
         }
     }
 
diff --git a/src/com/android/settings/homepage/SettingsHomepageActivity.java b/src/com/android/settings/homepage/SettingsHomepageActivity.java
index 237318f..5eb9d94 100644
--- a/src/com/android/settings/homepage/SettingsHomepageActivity.java
+++ b/src/com/android/settings/homepage/SettingsHomepageActivity.java
@@ -21,6 +21,7 @@
 import android.app.settings.SettingsEnums;
 import android.os.Bundle;
 import android.util.FeatureFlagUtils;
+import android.util.Log;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
@@ -41,6 +42,9 @@
 
 public class SettingsHomepageActivity extends FragmentActivity {
 
+    private static final String TAG = "SettingsHomepageActivity";
+    private int mSearchBoxHeight;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -50,7 +54,9 @@
         root.setSystemUiVisibility(
                 View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
 
-        setHomepageContainerPaddingTop();
+        final View appBar = findViewById(R.id.app_bar_container);
+        appBar.setMinimumHeight(getSearchBoxHeight());
+        setDefaultHomepageContainerPaddingTop();
 
         final Toolbar toolbar = findViewById(R.id.search_action_bar);
         FeatureFactory.getFactory(this).getSearchFeatureProvider()
@@ -60,16 +66,36 @@
         getLifecycle().addObserver(new AvatarViewMixin(this, avatarView));
         getLifecycle().addObserver(new HideNonSystemOverlayMixin(this));
 
-        if (FeatureFlagUtils.isEnabled(this, FeatureFlags.CONTEXTUAL_HOME)
-                && !getSystemService(ActivityManager.class).isLowRamDevice()) {
-            // Only allow contextual feature on high ram devices.
-            showFragment(new ContextualCardsFragment(), R.id.contextual_cards_content);
+        if (!getSystemService(ActivityManager.class).isLowRamDevice()) {
+            // Only allow contextual features on high ram devices.
+            if (FeatureFlagUtils.isEnabled(this, FeatureFlags.SILKY_HOME)) {
+                showSuggestionFragment();
+            }
+            if (FeatureFlagUtils.isEnabled(this, FeatureFlags.CONTEXTUAL_HOME)) {
+                showFragment(new ContextualCardsFragment(), R.id.contextual_cards_content);
+            }
         }
         showFragment(new TopLevelSettings(), R.id.main_content);
         ((FrameLayout) findViewById(R.id.main_content))
                 .getLayoutTransition().enableTransitionType(LayoutTransition.CHANGING);
     }
 
+    private void showSuggestionFragment() {
+        final Class<? extends Fragment> fragment = FeatureFactory.getFactory(this)
+                .getSuggestionFeatureProvider(this).getContextualSuggestionFragment();
+        if (fragment == null) {
+            return;
+        }
+
+        try {
+            showFragment(fragment.newInstance(), R.id.contextual_suggestion_content);
+            setHomepageContainerTopOffset(getResources()
+                    .getDimensionPixelSize(R.dimen.suggestion_height));
+        } catch (IllegalAccessException | InstantiationException e) {
+            Log.w(TAG, "Cannot show fragment", e);
+        }
+    }
+
     private void showFragment(Fragment fragment, int id) {
         final FragmentManager fragmentManager = getSupportFragmentManager();
         final FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
@@ -84,18 +110,32 @@
     }
 
     @VisibleForTesting
-    void setHomepageContainerPaddingTop() {
-        final View view = this.findViewById(R.id.homepage_container);
-
-        final int searchBarHeight = getResources().getDimensionPixelSize(R.dimen.search_bar_height);
-        final int searchBarMargin = getResources().getDimensionPixelSize(R.dimen.search_bar_margin);
-
-        // The top padding is the height of action bar(48dp) + top/bottom margins(16dp)
-        final int paddingTop = searchBarHeight + searchBarMargin * 2;
+    void setHomepageContainerTopOffset(int offset) {
+        final View view = findViewById(R.id.homepage_container);
+        final int paddingTop = getSearchBoxHeight() + offset;
         view.setPadding(0 /* left */, paddingTop, 0 /* right */, 0 /* bottom */);
 
         // Prevent inner RecyclerView gets focus and invokes scrolling.
         view.setFocusableInTouchMode(true);
         view.requestFocus();
     }
+
+    @VisibleForTesting
+    void setDefaultHomepageContainerPaddingTop() {
+        setHomepageContainerTopOffset(0);
+    }
+
+    @VisibleForTesting
+    int getSearchBoxHeight() {
+        if (mSearchBoxHeight != 0) {
+            return mSearchBoxHeight;
+        }
+
+        final int searchBarHeight = getResources().getDimensionPixelSize(R.dimen.search_bar_height);
+        final int searchBarMargin = getResources().getDimensionPixelSize(R.dimen.search_bar_margin);
+
+        // The height of search box is the height of search bar(48dp) + top/bottom margins(24dp)
+        mSearchBoxHeight = searchBarHeight + searchBarMargin * 2;
+        return mSearchBoxHeight;
+    }
 }
diff --git a/src/com/android/settings/homepage/contextualcards/ControllerRendererPool.java b/src/com/android/settings/homepage/contextualcards/ControllerRendererPool.java
index 755a105..f556018 100644
--- a/src/com/android/settings/homepage/contextualcards/ControllerRendererPool.java
+++ b/src/com/android/settings/homepage/contextualcards/ControllerRendererPool.java
@@ -56,7 +56,7 @@
         final Class<? extends ContextualCardController> clz =
                 ContextualCardLookupTable.getCardControllerClass(cardType);
         for (ContextualCardController controller : mControllers) {
-            if (controller.getClass() == clz) {
+            if (controller.getClass().getName().equals(clz.getName())) {
                 Log.d(TAG, "Controller is already there.");
                 return (T) controller;
             }
diff --git a/src/com/android/settings/network/MobilePlanPreferenceController.java b/src/com/android/settings/network/MobilePlanPreferenceController.java
index 255dfcd..b4135b8 100644
--- a/src/com/android/settings/network/MobilePlanPreferenceController.java
+++ b/src/com/android/settings/network/MobilePlanPreferenceController.java
@@ -145,7 +145,7 @@
             }
 
             // Get provisioning URL
-            String url = mCm.getMobileProvisioningUrl();
+            String url = mTm.getMobileProvisioningUrl();
             if (!TextUtils.isEmpty(url)) {
                 Intent intent = Intent.makeMainSelectorActivity(Intent.ACTION_MAIN,
                         Intent.CATEGORY_APP_BROWSER);
diff --git a/src/com/android/settings/network/NetworkMobileProviderController.java b/src/com/android/settings/network/NetworkMobileProviderController.java
index 4c29256..5dc6c0d 100644
--- a/src/com/android/settings/network/NetworkMobileProviderController.java
+++ b/src/com/android/settings/network/NetworkMobileProviderController.java
@@ -24,6 +24,7 @@
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.core.BasePreferenceController;
+import com.android.settings.wifi.WifiPickerTrackerHelper;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 /**
@@ -115,4 +116,10 @@
         }
         mPreferenceCategory.setVisible(available);
     }
+
+    public void setWifiPickerTrackerHelper(WifiPickerTrackerHelper helper) {
+        if (mSubscriptionsController != null) {
+            mSubscriptionsController.setWifiPickerTrackerHelper(helper);
+        }
+    }
 }
diff --git a/src/com/android/settings/network/NetworkProviderSettings.java b/src/com/android/settings/network/NetworkProviderSettings.java
index c2881ac..c4c767b 100644
--- a/src/com/android/settings/network/NetworkProviderSettings.java
+++ b/src/com/android/settings/network/NetworkProviderSettings.java
@@ -27,19 +27,12 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.net.ConnectivityManager;
-import android.net.NetworkScoreManager;
 import android.net.NetworkTemplate;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.Looper;
 import android.os.PowerManager;
-import android.os.Process;
-import android.os.SimpleClock;
-import android.os.SystemClock;
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.FeatureFlagUtils;
@@ -74,6 +67,7 @@
 import com.android.settings.wifi.WifiConfigUiBase2;
 import com.android.settings.wifi.WifiConnectListener;
 import com.android.settings.wifi.WifiDialog2;
+import com.android.settings.wifi.WifiPickerTrackerHelper;
 import com.android.settings.wifi.WifiUtils;
 import com.android.settings.wifi.details2.WifiNetworkDetailsFragment2;
 import com.android.settings.wifi.dpp.WifiDppUtils;
@@ -88,8 +82,6 @@
 import com.android.wifitrackerlib.WifiEntry.ConnectCallback;
 import com.android.wifitrackerlib.WifiPickerTracker;
 
-import java.time.Clock;
-import java.time.ZoneOffset;
 import java.util.List;
 import java.util.Optional;
 
@@ -115,11 +107,6 @@
     static final int MENU_ID_FORGET = Menu.FIRST + 3;
     static final int MENU_ID_MODIFY = Menu.FIRST + 4;
 
-    // Max age of tracked WifiEntries
-    private static final long MAX_SCAN_AGE_MILLIS = 15_000;
-    // Interval between initiating WifiPickerTracker scans
-    private static final long SCAN_INTERVAL_MILLIS = 10_000;
-
     @VisibleForTesting
     static final int ADD_NETWORK_REQUEST = 2;
     static final int CONFIG_NETWORK_REQUEST = 3;
@@ -187,11 +174,9 @@
      */
     private boolean mIsRestricted;
 
-    // Worker thread used for WifiPickerTracker work
-    private HandlerThread mWorkerThread;
-
     @VisibleForTesting
     WifiPickerTracker mWifiPickerTracker;
+    private WifiPickerTrackerHelper mWifiPickerTrackerHelper;
 
     private WifiDialog2 mDialog;
 
@@ -279,27 +264,9 @@
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        final Context context = getContext();
-        mWorkerThread = new HandlerThread(TAG
-                + "{" + Integer.toHexString(System.identityHashCode(this)) + "}",
-                Process.THREAD_PRIORITY_BACKGROUND);
-        mWorkerThread.start();
-        final Clock elapsedRealtimeClock = new SimpleClock(ZoneOffset.UTC) {
-            @Override
-            public long millis() {
-                return SystemClock.elapsedRealtime();
-            }
-        };
-        mWifiPickerTracker = new WifiPickerTracker(getSettingsLifecycle(), context,
-                context.getSystemService(WifiManager.class),
-                context.getSystemService(ConnectivityManager.class),
-                context.getSystemService(NetworkScoreManager.class),
-                new Handler(Looper.getMainLooper()),
-                mWorkerThread.getThreadHandler(),
-                elapsedRealtimeClock,
-                MAX_SCAN_AGE_MILLIS,
-                SCAN_INTERVAL_MILLIS,
-                this);
+        mWifiPickerTrackerHelper =
+                new WifiPickerTrackerHelper(getSettingsLifecycle(), getContext(), this);
+        mWifiPickerTracker = mWifiPickerTrackerHelper.getWifiPickerTracker();
 
         final Activity activity = getActivity();
 
@@ -356,6 +323,10 @@
         if (intent.hasExtra(EXTRA_START_CONNECT_SSID)) {
             mOpenSsid = intent.getStringExtra(EXTRA_START_CONNECT_SSID);
         }
+
+        if (mNetworkMobileProviderController != null) {
+            mNetworkMobileProviderController.setWifiPickerTrackerHelper(mWifiPickerTrackerHelper);
+        }
     }
 
     @Override
@@ -365,13 +336,6 @@
     }
 
     @Override
-    public void onDestroyView() {
-        mWorkerThread.quit();
-
-        super.onDestroyView();
-    }
-
-    @Override
     public void onStart() {
         super.onStart();
 
diff --git a/src/com/android/settings/network/ProviderModelSlice.java b/src/com/android/settings/network/ProviderModelSlice.java
index f6908c9..a495e89 100644
--- a/src/com/android/settings/network/ProviderModelSlice.java
+++ b/src/com/android/settings/network/ProviderModelSlice.java
@@ -82,7 +82,7 @@
         // Third section:  Add the Wi-Fi items which are not connected.
         // Fourth section:  If device has connection problem, this row show the message for user.
 
-        if (mHelper.isAirplaneModeEnabled()) {
+        if (mHelper.isAirplaneModeEnabled() && !mWifiManager.isWifiEnabled()) {
             log("Airplane mode is enabled.");
             // ToDo Next CL will add the Airplane mode Message.
             return mHelper.createListBuilder(getUri()).build();
@@ -165,16 +165,28 @@
         if (subscriptionManager == null) {
             return;
         }
-        final boolean newState = intent.getBooleanExtra(EXTRA_TOGGLE_STATE,
-                mHelper.isMobileDataEnabled());
         final int defaultSubId = subscriptionManager.getDefaultDataSubscriptionId();
         log("defaultSubId:" + defaultSubId);
         if (!SubscriptionManager.isUsableSubscriptionId(defaultSubId)) {
             return; // No subscription - do nothing.
         }
+        boolean requestConnectCarrier = !intent.hasExtra(EXTRA_TOGGLE_STATE);
+        // Enable the mobile data always if the user requests to connect to the carrier network.
+        boolean newState = requestConnectCarrier ? true
+                : intent.getBooleanExtra(EXTRA_TOGGLE_STATE, mHelper.isMobileDataEnabled());
 
         MobileNetworkUtils.setMobileDataEnabled(mContext, defaultSubId, newState,
                 false /* disableOtherSubscriptions */);
+
+        final NetworkProviderWorker worker = getWorker();
+        if (worker == null) {
+            return;
+        }
+        if (requestConnectCarrier) {
+            worker.connectCarrierNetwork();
+        } else {
+            worker.setCarrierNetworkEnabled(newState);
+        }
     }
 
     @Override
diff --git a/src/com/android/settings/network/ProviderModelSliceHelper.java b/src/com/android/settings/network/ProviderModelSliceHelper.java
index 482695a..3164af4 100644
--- a/src/com/android/settings/network/ProviderModelSliceHelper.java
+++ b/src/com/android/settings/network/ProviderModelSliceHelper.java
@@ -131,14 +131,16 @@
             e.printStackTrace();
         }
         final IconCompat levelIcon = Utils.createIconWithDrawable(drawable);
-        final PendingIntent toggleAction = mSliceable.getBroadcastIntent(mContext);
-        final SliceAction toggleSliceAction = SliceAction.createToggle(toggleAction,
+        final PendingIntent rowIntent = mSliceable.getBroadcastIntent(mContext);
+        final SliceAction primaryAction = SliceAction.create(rowIntent,
+                levelIcon, ListBuilder.ICON_IMAGE, title);
+        final SliceAction toggleAction = SliceAction.createToggle(rowIntent,
                 "mobile_toggle" /* actionTitle */, isMobileDataEnabled());
         final ListBuilder.RowBuilder rowBuilder = new ListBuilder.RowBuilder()
                 .setTitle(title)
                 .setTitleItem(levelIcon, ListBuilder.ICON_IMAGE)
-                .addEndItem(toggleSliceAction)
-                .setPrimaryAction(toggleSliceAction)
+                .addEndItem(toggleAction)
+                .setPrimaryAction(primaryAction)
                 .setSubtitle(summary);
         return rowBuilder;
     }
@@ -242,7 +244,8 @@
         //TODO: get radio technology.
         String networkType = "";
         if (isDataSimActive()) {
-            summary = mContext.getString(R.string.mobile_data_connection_active, networkType);
+            summary = mContext.getString(R.string.preference_summary_default_combination,
+                    mContext.getString(R.string.mobile_data_connection_active), networkType);
         } else if (!isMobileDataEnabled()) {
             summary = mContext.getString(R.string.mobile_data_off_summary);
         }
diff --git a/src/com/android/settings/network/SubscriptionsPreferenceController.java b/src/com/android/settings/network/SubscriptionsPreferenceController.java
index f4ffd09..6e67543 100644
--- a/src/com/android/settings/network/SubscriptionsPreferenceController.java
+++ b/src/com/android/settings/network/SubscriptionsPreferenceController.java
@@ -21,10 +21,13 @@
 
 import static com.android.settings.network.telephony.MobileNetworkUtils.NO_CELL_DATA_TYPE_ICON;
 
+import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.graphics.drawable.Drawable;
 import android.provider.Settings;
+import android.telephony.ServiceState;
 import android.telephony.SignalStrength;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
@@ -46,6 +49,8 @@
 import com.android.settings.network.telephony.MobileNetworkActivity;
 import com.android.settings.network.telephony.MobileNetworkUtils;
 import com.android.settings.network.telephony.SignalStrengthListener;
+import com.android.settings.widget.GearPreference;
+import com.android.settings.wifi.WifiPickerTrackerHelper;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.net.SignalStrengthUtil;
 
@@ -55,9 +60,15 @@
 import java.util.Set;
 
 /**
- * This manages a set of Preferences it places into a PreferenceGroup owned by some parent
+ * If the provider model is not enabled, this controller manages a set of Preferences it places into
+ * a PreferenceGroup owned by some parent
  * controller class - one for each available subscription. This controller is only considered
  * available if there are 2 or more subscriptions.
+ *
+ * If the provider model is enabled, this controller manages preference with data subscription
+ * information and make its state display on preference.
+ * TODO this class will clean up the multiple subscriptions functionality after the provider
+ * model is released.
  */
 public class SubscriptionsPreferenceController extends AbstractPreferenceController implements
         LifecycleObserver, SubscriptionsChangeListener.SubscriptionsChangeListenerClient,
@@ -68,16 +79,31 @@
     private UpdateListener mUpdateListener;
     private String mPreferenceGroupKey;
     private PreferenceGroup mPreferenceGroup;
-    private SubscriptionManager mManager;
+    private TelephonyManager mTelephonyManager;
+    private SubscriptionManager mSubscriptionManager;
     private SubscriptionsChangeListener mSubscriptionsListener;
     private MobileDataEnabledListener mDataEnabledListener;
     private DataConnectivityListener mConnectivityListener;
     private SignalStrengthListener mSignalStrengthListener;
+    private WifiPickerTrackerHelper mWifiPickerTrackerHelper;
 
+    @VisibleForTesting
+    final BroadcastReceiver mDataSubscriptionChangedReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            final String action = intent.getAction();
+            if (action.equals(TelephonyManager.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED)) {
+                update();
+            }
+        }
+    };
 
     // Map of subscription id to Preference
     private Map<Integer, Preference> mSubscriptionPreferences;
     private int mStartOrder;
+    private GearPreference mSubsGearPref;
+
+    private SubsPrefCtrlInjector mSubsPrefCtrlInjector;
     /**
      * This interface lets a parent of this class know that some change happened - this could
      * either be because overall availability changed, or because we've added/removed/updated some
@@ -107,21 +133,37 @@
         mUpdateListener = updateListener;
         mPreferenceGroupKey = preferenceGroupKey;
         mStartOrder = startOrder;
-        mManager = context.getSystemService(SubscriptionManager.class);
+        mTelephonyManager = context.getSystemService(TelephonyManager.class);
+        mSubscriptionManager = context.getSystemService(SubscriptionManager.class);
         mSubscriptionPreferences = new ArrayMap<>();
         mSubscriptionsListener = new SubscriptionsChangeListener(context, this);
         mDataEnabledListener = new MobileDataEnabledListener(context, this);
         mConnectivityListener = new DataConnectivityListener(context, this);
         mSignalStrengthListener = new SignalStrengthListener(context, this);
         lifecycle.addObserver(this);
+        mSubsPrefCtrlInjector = createSubsPrefCtrlInjector();
+    }
+
+    private void registerDataSubscriptionChangedReceiver() {
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(TelephonyManager.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED);
+        mContext.registerReceiver(mDataSubscriptionChangedReceiver, filter);
+    }
+
+    private void unRegisterDataSubscriptionChangedReceiver() {
+        if (mDataSubscriptionChangedReceiver != null) {
+            mContext.unregisterReceiver(mDataSubscriptionChangedReceiver);
+        }
+
     }
 
     @OnLifecycleEvent(ON_RESUME)
     public void onResume() {
         mSubscriptionsListener.start();
-        mDataEnabledListener.start(SubscriptionManager.getDefaultDataSubscriptionId());
+        mDataEnabledListener.start(mSubsPrefCtrlInjector.getDefaultDataSubscriptionId());
         mConnectivityListener.start();
         mSignalStrengthListener.resume();
+        registerDataSubscriptionChangedReceiver();
         update();
     }
 
@@ -131,6 +173,7 @@
         mDataEnabledListener.stop();
         mConnectivityListener.stop();
         mSignalStrengthListener.pause();
+        unRegisterDataSubscriptionChangedReceiver();
     }
 
     @Override
@@ -143,29 +186,116 @@
         if (mPreferenceGroup == null) {
             return;
         }
-
         if (!isAvailable()) {
+            if (mSubsGearPref != null) {
+                mPreferenceGroup.removePreference(mSubsGearPref);
+            }
             for (Preference pref : mSubscriptionPreferences.values()) {
                 mPreferenceGroup.removePreference(pref);
             }
+
             mSubscriptionPreferences.clear();
             mSignalStrengthListener.updateSubscriptionIds(Collections.emptySet());
             mUpdateListener.onChildrenUpdated();
             return;
         }
 
+        if (mSubsPrefCtrlInjector.isProviderModelEnabled(mContext)) {
+            updateForProvider();
+        } else {
+            updateForBase();
+        }
+    }
+
+    private void updateForProvider() {
+        SubscriptionInfo subInfo = mSubscriptionManager.getDefaultDataSubscriptionInfo();
+        if (subInfo == null) {
+            mPreferenceGroup.removeAll();
+            return;
+        }
+        if (mSubsGearPref == null) {
+            mPreferenceGroup.removeAll();
+            mSubsGearPref = new GearPreference(mContext, null);
+            mSubsGearPref.setOnPreferenceClickListener(preference -> {
+                connectCarrierNetwork();
+                return true;
+            });
+            mSubsGearPref.setOnGearClickListener(p ->
+                    startMobileNetworkActivity(mContext, subInfo.getSubscriptionId()));
+        }
+
+        mSubsGearPref.setTitle(subInfo.getDisplayName());
+        mSubsGearPref.setOrder(mStartOrder);
+        //TODO(b/176141828) Wait for api provided by system ui.
+        mSubsGearPref.setSummary(getMobilePreferenceSummary());
+        mSubsGearPref.setIcon(getIcon(subInfo.getSubscriptionId()));
+        mPreferenceGroup.addPreference(mSubsGearPref);
+
+        final Set<Integer> activeDataSubIds = new ArraySet<>();
+        activeDataSubIds.add(subInfo.getSubscriptionId());
+        mSignalStrengthListener.updateSubscriptionIds(activeDataSubIds);
+        mUpdateListener.onChildrenUpdated();
+    }
+
+    private String getMobilePreferenceSummary() {
+        //TODO(b/176141828) Waiting for the api provided by system UI.
+        String result = "5G";
+        if (MobileNetworkUtils.activeNetworkIsCellular(mContext)) {
+            result = "Active, " + result;
+        }
+        return result;
+    }
+
+    private Drawable getIcon(int subId) {
+        final TelephonyManager tmForSubId = mTelephonyManager.createForSubscriptionId(subId);
+        final SignalStrength strength = tmForSubId.getSignalStrength();
+        int level = (strength == null) ? 0 : strength.getLevel();
+
+        int numLevels = SignalStrength.NUM_SIGNAL_STRENGTH_BINS;
+        if (shouldInflateSignalStrength(subId)) {
+            level += 1;
+            numLevels += 1;
+        }
+
+        final boolean isMobileDataOn = tmForSubId.isDataEnabled();
+        final boolean isActiveCellularNetwork =
+                mSubsPrefCtrlInjector.isActiveCellularNetwork(mContext);
+        final boolean isMobileDataAccessible = tmForSubId.getDataState()
+                == TelephonyManager.DATA_CONNECTED;
+        final ServiceState serviceState = tmForSubId.getServiceState();
+        final boolean isVoiceOutOfService = (serviceState == null)
+                ? true
+                : (serviceState.getState() == ServiceState.STATE_OUT_OF_SERVICE);
+
+        Drawable icon = mSubsPrefCtrlInjector.getIcon(mContext, level, numLevels, false);
+
+        if (isActiveCellularNetwork) {
+            icon.setTint(Utils.getColorAccentDefaultColor(mContext));
+            return icon;
+        }
+        if ((isMobileDataOn && isMobileDataAccessible)
+                || (!isMobileDataOn && !isVoiceOutOfService)) {
+            return icon;
+        }
+
+        icon = mContext.getDrawable(R.drawable.ic_signal_strength_zero_bar_no_internet);
+        return icon;
+    }
+
+    private void updateForBase() {
         final Map<Integer, Preference> existingPrefs = mSubscriptionPreferences;
         mSubscriptionPreferences = new ArrayMap<>();
 
         int order = mStartOrder;
         final Set<Integer> activeSubIds = new ArraySet<>();
-        final int dataDefaultSubId = SubscriptionManager.getDefaultDataSubscriptionId();
-        for (SubscriptionInfo info : SubscriptionUtil.getActiveSubscriptions(mManager)) {
+        final int dataDefaultSubId = mSubsPrefCtrlInjector.getDefaultDataSubscriptionId();
+        for (SubscriptionInfo info :
+                SubscriptionUtil.getActiveSubscriptions(mSubscriptionManager)) {
             final int subId = info.getSubscriptionId();
             // Avoid from showing subscription(SIM)s which has been marked as hidden
             // For example, only one subscription will be shown when there're multiple
             // subscriptions with same group UUID.
-            if (!canSubscriptionBeDisplayed(mContext, subId)) {
+            if (!mSubsPrefCtrlInjector.canSubscriptionBeDisplayed(mContext, subId)) {
                 continue;
             }
             activeSubIds.add(subId);
@@ -181,9 +311,7 @@
             pref.setOrder(order++);
 
             pref.setOnPreferenceClickListener(clickedPref -> {
-                final Intent intent = new Intent(mContext, MobileNetworkActivity.class);
-                intent.putExtra(Settings.EXTRA_SUB_ID, subId);
-                mContext.startActivity(intent);
+                startMobileNetworkActivity(mContext, subId);
                 return true;
             });
 
@@ -198,6 +326,12 @@
         mUpdateListener.onChildrenUpdated();
     }
 
+    private static void startMobileNetworkActivity(Context context, int subId) {
+        final Intent intent = new Intent(context, MobileNetworkActivity.class);
+        intent.putExtra(Settings.EXTRA_SUB_ID, subId);
+        context.startActivity(intent);
+    }
+
     @VisibleForTesting
     boolean shouldInflateSignalStrength(int subId) {
         return SignalStrengthUtil.shouldInflateSignalStrength(mContext, subId);
@@ -214,14 +348,9 @@
             level += 1;
             numLevels += 1;
         }
-        final boolean showCutOut = !isDefaultForData || !mgr.isDataEnabled();
-        pref.setIcon(getIcon(level, numLevels, showCutOut));
-    }
 
-    @VisibleForTesting
-    Drawable getIcon(int level, int numLevels, boolean cutOut) {
-        return MobileNetworkUtils.getSignalStrengthIcon(mContext, level, numLevels,
-                NO_CELL_DATA_TYPE_ICON, cutOut);
+        final boolean showCutOut = !isDefaultForData || !mgr.isDataEnabled();
+        pref.setIcon(mSubsPrefCtrlInjector.getIcon(mContext, level, numLevels, showCutOut));
     }
 
     /**
@@ -236,8 +365,8 @@
      * If a subscription isn't the default for anything, we just say it is available.
      */
     protected String getSummary(int subId, boolean isDefaultForData) {
-        final int callsDefaultSubId = SubscriptionManager.getDefaultVoiceSubscriptionId();
-        final int smsDefaultSubId = SubscriptionManager.getDefaultSmsSubscriptionId();
+        final int callsDefaultSubId = mSubsPrefCtrlInjector.getDefaultVoiceSubscriptionId();
+        final int smsDefaultSubId = mSubsPrefCtrlInjector.getDefaultSmsSubscriptionId();
 
         String line1 = null;
         if (subId == callsDefaultSubId && subId == smsDefaultSubId) {
@@ -253,7 +382,7 @@
             final TelephonyManager telMgrForSub = mContext.getSystemService(
                     TelephonyManager.class).createForSubscriptionId(subId);
             final boolean dataEnabled = telMgrForSub.isDataEnabled();
-            if (dataEnabled && MobileNetworkUtils.activeNetworkIsCellular(mContext)) {
+            if (dataEnabled && mSubsPrefCtrlInjector.isActiveCellularNetwork(mContext)) {
                 line2 = mContext.getString(R.string.mobile_data_active);
             } else if (!dataEnabled) {
                 line2 = mContext.getString(R.string.mobile_data_off);
@@ -274,14 +403,16 @@
     }
 
     /**
-     * @return true if there are at least 2 available subscriptions.
+     * @return true if there are at least 2 available subscriptions,
+     * or if there is at least 1 available subscription for provider model.
      */
     @Override
     public boolean isAvailable() {
         if (mSubscriptionsListener.isAirplaneModeOn()) {
             return false;
         }
-        List<SubscriptionInfo> subInfoList = SubscriptionUtil.getActiveSubscriptions(mManager);
+        List<SubscriptionInfo> subInfoList =
+                SubscriptionUtil.getActiveSubscriptions(mSubscriptionManager);
         if (subInfoList == null) {
             return false;
         }
@@ -290,8 +421,9 @@
                 // For example, only one subscription will be shown when there're multiple
                 // subscriptions with same group UUID.
                 .filter(subInfo ->
-                        canSubscriptionBeDisplayed(mContext, subInfo.getSubscriptionId()))
-                .count() >= (Utils.isProviderModelEnabled(mContext) ? 1 : 2);
+                        mSubsPrefCtrlInjector.canSubscriptionBeDisplayed(mContext,
+                                subInfo.getSubscriptionId()))
+                .count() >= (mSubsPrefCtrlInjector.isProviderModelEnabled(mContext) ? 1 : 2);
     }
 
     @Override
@@ -307,7 +439,7 @@
     @Override
     public void onSubscriptionsChanged() {
         // See if we need to change which sub id we're using to listen for enabled/disabled changes.
-        int defaultDataSubId = SubscriptionManager.getDefaultDataSubscriptionId();
+        int defaultDataSubId = mSubsPrefCtrlInjector.getDefaultDataSubscriptionId();
         if (defaultDataSubId != mDataEnabledListener.getSubId()) {
             mDataEnabledListener.stop();
             mDataEnabledListener.start(defaultDataSubId);
@@ -335,4 +467,79 @@
         return (SubscriptionUtil.getAvailableSubscription(context,
                 ProxySubscriptionManager.getInstance(context), subId) != null);
     }
-}
+
+    public void setWifiPickerTrackerHelper(WifiPickerTrackerHelper helper) {
+        mWifiPickerTrackerHelper = helper;
+    }
+
+    @VisibleForTesting
+    public void connectCarrierNetwork() {
+        if (mTelephonyManager == null || !mTelephonyManager.isDataEnabled()) {
+            return;
+        }
+        if (mWifiPickerTrackerHelper != null) {
+            mWifiPickerTrackerHelper.connectCarrierNetwork(null /* ConnectCallback */);
+        }
+    }
+
+    SubsPrefCtrlInjector createSubsPrefCtrlInjector() {
+        return new SubsPrefCtrlInjector();
+    }
+
+    /**
+     * To inject necessary data from each static api.
+     */
+    @VisibleForTesting
+    public static class SubsPrefCtrlInjector {
+        /**
+         * Use to inject function and value for class and test class.
+         */
+        public boolean canSubscriptionBeDisplayed(Context context, int subId) {
+            return (SubscriptionUtil.getAvailableSubscription(context,
+                    ProxySubscriptionManager.getInstance(context), subId) != null);
+        }
+
+        /**
+         * Check SIM be able to display on UI.
+         */
+        public int getDefaultSmsSubscriptionId() {
+            return SubscriptionManager.getDefaultSmsSubscriptionId();
+        }
+
+        /**
+         * Get default voice subscription ID.
+         */
+        public int getDefaultVoiceSubscriptionId() {
+            return SubscriptionManager.getDefaultVoiceSubscriptionId();
+        }
+
+        /**
+         * Get default data subscription ID.
+         */
+        public int getDefaultDataSubscriptionId() {
+            return SubscriptionManager.getDefaultDataSubscriptionId();
+        }
+
+        /**
+         * Confirm the current network is cellular and active.
+         */
+        public boolean isActiveCellularNetwork(Context context) {
+            return MobileNetworkUtils.activeNetworkIsCellular(context);
+        }
+
+        /**
+         * Confirm the flag of Provider Model switch is turned on or not.
+         */
+        public boolean isProviderModelEnabled(Context context) {
+            return Utils.isProviderModelEnabled(context);
+        }
+
+        /**
+         * Get signal icon with different signal level.
+         */
+        public Drawable getIcon(Context context, int level, int numLevels, boolean cutOut) {
+            return MobileNetworkUtils.getSignalStrengthIcon(context, level, numLevels,
+                    NO_CELL_DATA_TYPE_ICON, cutOut);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/network/telephony/MobileDataDialogFragment.java b/src/com/android/settings/network/telephony/MobileDataDialogFragment.java
index c8a1e98..180d503 100644
--- a/src/com/android/settings/network/telephony/MobileDataDialogFragment.java
+++ b/src/com/android/settings/network/telephony/MobileDataDialogFragment.java
@@ -28,6 +28,7 @@
 
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.wifi.WifiPickerTrackerHelper;
 
 
 /**
@@ -50,6 +51,8 @@
     private int mType;
     private int mSubId;
 
+    private WifiPickerTrackerHelper mWifiPickerTrackerHelper;
+
     public static MobileDataDialogFragment newInstance(int type, int subId) {
         final MobileDataDialogFragment dialogFragment = new MobileDataDialogFragment();
 
@@ -65,6 +68,8 @@
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mSubscriptionManager = getContext().getSystemService(SubscriptionManager.class);
+        mWifiPickerTrackerHelper = new WifiPickerTrackerHelper(getSettingsLifecycle(), getContext(),
+                null /* WifiPickerTrackerCallback */);
     }
 
     @Override
@@ -124,11 +129,17 @@
             case TYPE_DISABLE_DIALOG:
                 MobileNetworkUtils.setMobileDataEnabled(getContext(), mSubId, false /* enabled */,
                         false /* disableOtherSubscriptions */);
+                if (mWifiPickerTrackerHelper != null) {
+                    mWifiPickerTrackerHelper.setCarrierNetworkEnabled(false);
+                }
                 break;
             case TYPE_MULTI_SIM_DIALOG:
                 mSubscriptionManager.setDefaultDataSubId(mSubId);
                 MobileNetworkUtils.setMobileDataEnabled(getContext(), mSubId, true /* enabled */,
                         true /* disableOtherSubscriptions */);
+                if (mWifiPickerTrackerHelper != null) {
+                    mWifiPickerTrackerHelper.setCarrierNetworkEnabled(true);
+                }
                 break;
             default:
                 throw new IllegalArgumentException("unknown type " + mType);
diff --git a/src/com/android/settings/network/telephony/MobileDataPreferenceController.java b/src/com/android/settings/network/telephony/MobileDataPreferenceController.java
index 91c46df..78bc0a0 100644
--- a/src/com/android/settings/network/telephony/MobileDataPreferenceController.java
+++ b/src/com/android/settings/network/telephony/MobileDataPreferenceController.java
@@ -32,6 +32,7 @@
 
 import com.android.settings.R;
 import com.android.settings.network.MobileDataContentObserver;
+import com.android.settings.wifi.WifiPickerTrackerHelper;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
@@ -54,6 +55,8 @@
     @VisibleForTesting
     boolean mNeedDialog;
 
+    private WifiPickerTrackerHelper mWifiPickerTrackerHelper;
+
     public MobileDataPreferenceController(Context context, String key) {
         super(context, key);
         mSubscriptionManager = context.getSystemService(SubscriptionManager.class);
@@ -107,6 +110,9 @@
         if (!mNeedDialog) {
             // Update data directly if we don't need dialog
             MobileNetworkUtils.setMobileDataEnabled(mContext, mSubId, isChecked, false);
+            if (mWifiPickerTrackerHelper != null) {
+                mWifiPickerTrackerHelper.setCarrierNetworkEnabled(isChecked);
+            }
             return true;
         }
 
@@ -149,6 +155,10 @@
                 .createForSubscriptionId(mSubId);
     }
 
+    public void setWifiPickerTrackerHelper(WifiPickerTrackerHelper helper) {
+        mWifiPickerTrackerHelper = helper;
+    }
+
     @VisibleForTesting
     boolean isDialogNeeded() {
         final boolean enableData = !isChecked();
diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
index 2a11521..7c45949 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkSettings.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
@@ -43,6 +43,7 @@
 import com.android.settings.network.telephony.gsm.AutoSelectPreferenceController;
 import com.android.settings.network.telephony.gsm.OpenNetworkSelectPagePreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.wifi.WifiPickerTrackerHelper;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.search.SearchIndexable;
 import com.android.settingslib.utils.ThreadUtils;
@@ -147,6 +148,9 @@
         use(DisableSimFooterPreferenceController.class).init(mSubId);
         use(NrDisabledInDsdsFooterPreferenceController.class).init(mSubId);
         use(MobileDataPreferenceController.class).init(getFragmentManager(), mSubId);
+        use(MobileDataPreferenceController.class).setWifiPickerTrackerHelper(
+                new WifiPickerTrackerHelper(getSettingsLifecycle(), context,
+                        null /* WifiPickerTrackerCallback */));
         use(RoamingPreferenceController.class).init(getFragmentManager(), mSubId);
         use(ApnPreferenceController.class).init(mSubId);
         use(CarrierPreferenceController.class).init(mSubId);
diff --git a/src/com/android/settings/notification/AssistantFeedbackPreferenceController.java b/src/com/android/settings/notification/AssistantFeedbackPreferenceController.java
index 1566ae9..491fd8b 100644
--- a/src/com/android/settings/notification/AssistantFeedbackPreferenceController.java
+++ b/src/com/android/settings/notification/AssistantFeedbackPreferenceController.java
@@ -23,11 +23,13 @@
 import android.database.ContentObserver;
 import android.net.Uri;
 import android.os.Handler;
+import android.provider.DeviceConfig;
 import android.provider.Settings;
 
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
+import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.TogglePreferenceController;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -77,13 +79,15 @@
 
     @Override
     public int getAvailabilityStatus() {
-        return AVAILABLE;
+        return DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SYSTEMUI,
+                        SystemUiDeviceConfigFlags.ENABLE_NAS_FEEDBACK, false)
+                ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
     }
 
     @Override
     public boolean isChecked() {
         return Settings.Global.getInt(mContext.getContentResolver(),
-                NOTIFICATION_FEEDBACK_ENABLED, OFF) == ON;
+                NOTIFICATION_FEEDBACK_ENABLED, ON) == ON;
     }
 
     @Override
diff --git a/src/com/android/settings/notification/NotificationBackend.java b/src/com/android/settings/notification/NotificationBackend.java
index 6d51eb3..43d1700 100644
--- a/src/com/android/settings/notification/NotificationBackend.java
+++ b/src/com/android/settings/notification/NotificationBackend.java
@@ -45,6 +45,7 @@
 import android.os.ServiceManager;
 import android.os.UserHandle;
 import android.service.notification.ConversationChannelWrapper;
+import android.service.notification.NotificationListenerFilter;
 import android.text.format.DateUtils;
 import android.util.IconDrawableFactory;
 import android.util.Log;
@@ -593,6 +594,32 @@
         }
     }
 
+    public NotificationListenerFilter getListenerFilter(ComponentName cn, int userId) {
+        try {
+            return sINM.getListenerFilter(cn, userId);
+        } catch (Exception e) {
+            Log.w(TAG, "Error calling NoMan", e);
+        }
+        return new NotificationListenerFilter();
+    }
+
+    public void setListenerFilter(ComponentName cn, int userId, NotificationListenerFilter nlf) {
+        try {
+            sINM.setListenerFilter(cn, userId, nlf);
+        } catch (Exception e) {
+            Log.w(TAG, "Error calling NoMan", e);
+        }
+    }
+
+    public boolean isNotificationListenerAccessGranted(ComponentName cn) {
+        try {
+            return sINM.isNotificationListenerAccessGranted(cn);
+        } catch (Exception e) {
+            Log.w(TAG, "Error calling NoMan", e);
+        }
+        return false;
+    }
+
     /**
      * NotificationsSentState contains how often an app sends notifications and how recently it sent
      * one.
diff --git a/src/com/android/settings/notification/zen/AbstractZenModePreferenceController.java b/src/com/android/settings/notification/zen/AbstractZenModePreferenceController.java
index 6fa446b..02e4015 100644
--- a/src/com/android/settings/notification/zen/AbstractZenModePreferenceController.java
+++ b/src/com/android/settings/notification/zen/AbstractZenModePreferenceController.java
@@ -84,7 +84,10 @@
         mScreen = screen;
         Preference pref = screen.findPreference(KEY);
         if (pref != null) {
-            mSettingObserver = new SettingObserver(pref);
+            if (mSettingObserver == null) {
+                mSettingObserver = new SettingObserver();
+            }
+            mSettingObserver.setPreference(pref);
         }
     }
 
@@ -128,10 +131,13 @@
         private final Uri ZEN_MODE_DURATION_URI = Settings.Secure.getUriFor(
                 Settings.Secure.ZEN_DURATION);
 
-        private final Preference mPreference;
+        private Preference mPreference;
 
-        public SettingObserver(Preference preference) {
+        public SettingObserver() {
             super(new Handler());
+        }
+
+        public void setPreference(Preference preference) {
             mPreference = preference;
         }
 
diff --git a/src/com/android/settings/notification/zen/ZenCustomRadioButtonPreference.java b/src/com/android/settings/notification/zen/ZenCustomRadioButtonPreference.java
deleted file mode 100644
index 57f4891..0000000
--- a/src/com/android/settings/notification/zen/ZenCustomRadioButtonPreference.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (C) 2018 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.notification.zen;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.RadioButton;
-
-import androidx.preference.PreferenceViewHolder;
-
-import com.android.settings.R;
-import com.android.settingslib.TwoTargetPreference;
-
-/**
- * A radio button preference with a divider and a settings icon that links to another screen.
- */
-public class ZenCustomRadioButtonPreference extends TwoTargetPreference
-        implements View.OnClickListener {
-
-    private RadioButton mButton;
-    private boolean mChecked;
-
-    private OnGearClickListener mOnGearClickListener;
-    private OnRadioButtonClickListener mOnRadioButtonClickListener;
-
-    public ZenCustomRadioButtonPreference(Context context, AttributeSet attrs,
-            int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-        setLayoutResource(R.layout.preference_two_target_radio);
-    }
-
-    public ZenCustomRadioButtonPreference(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        setLayoutResource(R.layout.preference_two_target_radio);
-    }
-
-    public ZenCustomRadioButtonPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        setLayoutResource(R.layout.preference_two_target_radio);
-    }
-
-    public ZenCustomRadioButtonPreference(Context context) {
-        super(context);
-        setLayoutResource(R.layout.preference_two_target_radio);
-    }
-
-    @Override
-    protected int getSecondTargetResId() {
-        return R.layout.preference_widget_gear;
-    }
-
-    public void setOnGearClickListener(OnGearClickListener l) {
-        mOnGearClickListener = l;
-        notifyChanged();
-    }
-
-    public void setOnRadioButtonClickListener(OnRadioButtonClickListener l) {
-        mOnRadioButtonClickListener = l;
-        notifyChanged();
-    }
-
-    @Override
-    public void onBindViewHolder(PreferenceViewHolder holder) {
-        super.onBindViewHolder(holder);
-        View buttonFrame = holder.findViewById(R.id.checkbox_frame);
-        if (buttonFrame != null) {
-            buttonFrame.setOnClickListener(this);
-        }
-        mButton = (RadioButton) holder.findViewById(android.R.id.checkbox);
-        if (mButton != null) {
-            mButton.setChecked(mChecked);
-        }
-
-        final View gear = holder.findViewById(android.R.id.widget_frame);
-        final View divider = holder.findViewById(R.id.two_target_divider);
-        if (mOnGearClickListener != null) {
-            divider.setVisibility(View.VISIBLE);
-            gear.setVisibility(View.VISIBLE);
-            gear.setOnClickListener(this);
-        } else {
-            divider.setVisibility(View.GONE);
-            gear.setVisibility(View.GONE);
-            gear.setOnClickListener(null);
-        }
-    }
-
-    public boolean isChecked() {
-        return mButton != null && mChecked;
-    }
-
-    public void setChecked(boolean checked) {
-        mChecked = checked;
-        if (mButton != null) {
-            mButton.setChecked(checked);
-        }
-    }
-
-    public RadioButton getRadioButton() {
-        return mButton;
-    }
-
-    @Override
-    public void onClick() {
-        if (mOnRadioButtonClickListener != null) {
-            mOnRadioButtonClickListener.onRadioButtonClick(this);
-        }
-    }
-
-    @Override
-    public void onClick(View v) {
-        if (v.getId() == android.R.id.widget_frame) {
-            if (mOnGearClickListener != null) {
-                mOnGearClickListener.onGearClick(this);
-            }
-        } else if (v.getId() == R.id.checkbox_frame) {
-            if (mOnRadioButtonClickListener != null) {
-                mOnRadioButtonClickListener.onRadioButtonClick(this);
-            }
-        }
-    }
-
-    public interface OnGearClickListener {
-        void onGearClick(ZenCustomRadioButtonPreference p);
-    }
-
-    public interface OnRadioButtonClickListener {
-        void onRadioButtonClick(ZenCustomRadioButtonPreference p);
-    }
-}
diff --git a/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceController.java b/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceController.java
index e77f4ea..5afe0b6 100644
--- a/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceController.java
@@ -16,9 +16,6 @@
 
 package com.android.settings.notification.zen;
 
-import static com.android.settings.widget.RadioButtonPreferenceWithExtraWidget.EXTRA_WIDGET_VISIBILITY_GONE;
-import static com.android.settings.widget.RadioButtonPreferenceWithExtraWidget.EXTRA_WIDGET_VISIBILITY_SETTING;
-
 import android.app.NotificationManager;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
@@ -37,7 +34,6 @@
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.notification.NotificationBackend;
 import com.android.settings.notification.app.ConversationListSettings;
-import com.android.settings.widget.RadioButtonPreferenceWithExtraWidget;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.widget.RadioButtonPreference;
 
@@ -186,13 +182,10 @@
     }
 
     private RadioButtonPreference makeRadioPreference(String key, int titleId) {
-        RadioButtonPreferenceWithExtraWidget pref =
-                new RadioButtonPreferenceWithExtraWidget(mPreferenceCategory.getContext());
+        final RadioButtonPreference pref =
+                new RadioButtonPreference(mPreferenceCategory.getContext());
         if (KEY_ALL.equals(key) || KEY_IMPORTANT.equals(key)) {
             pref.setExtraWidgetOnClickListener(mConversationSettingsWidgetClickListener);
-            pref.setExtraWidgetVisibility(EXTRA_WIDGET_VISIBILITY_SETTING);
-        } else {
-            pref.setExtraWidgetVisibility(EXTRA_WIDGET_VISIBILITY_GONE);
         }
         pref.setKey(key);
         pref.setTitle(titleId);
diff --git a/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceController.java b/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceController.java
index abf2ced..482865c 100644
--- a/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceController.java
@@ -19,9 +19,6 @@
 import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_CALLS;
 import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES;
 
-import static com.android.settings.widget.RadioButtonPreferenceWithExtraWidget.EXTRA_WIDGET_VISIBILITY_GONE;
-import static com.android.settings.widget.RadioButtonPreferenceWithExtraWidget.EXTRA_WIDGET_VISIBILITY_SETTING;
-
 import android.app.NotificationManager;
 import android.content.Context;
 import android.content.Intent;
@@ -35,7 +32,6 @@
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.widget.RadioButtonPreferenceWithExtraWidget;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.widget.RadioButtonPreference;
 
@@ -67,7 +63,7 @@
     private final boolean mIsMessages; // if this is false, then this preference is for calls
 
     private PreferenceCategory mPreferenceCategory;
-    private List<RadioButtonPreferenceWithExtraWidget> mRadioButtonPreferences = new ArrayList<>();
+    private List<RadioButtonPreference> mRadioButtonPreferences = new ArrayList<>();
 
     public ZenModePrioritySendersPreferenceController(Context context, String key,
             Lifecycle lifecycle, boolean isMessages) {
@@ -114,7 +110,7 @@
     public void updateState(Preference preference) {
         final int currSetting = getPrioritySenders();
 
-        for (RadioButtonPreferenceWithExtraWidget pref : mRadioButtonPreferences) {
+        for (RadioButtonPreference pref : mRadioButtonPreferences) {
             pref.setChecked(keyToSetting(pref.getKey()) == currSetting);
         }
     }
@@ -126,7 +122,7 @@
     }
 
     private void updateSummaries() {
-        for (RadioButtonPreferenceWithExtraWidget pref : mRadioButtonPreferences) {
+        for (RadioButtonPreference pref : mRadioButtonPreferences) {
             pref.setSummary(getSummary(pref.getKey()));
         }
     }
@@ -169,9 +165,9 @@
         }
     }
 
-    private RadioButtonPreferenceWithExtraWidget makeRadioPreference(String key, int titleId) {
-        RadioButtonPreferenceWithExtraWidget pref =
-                new RadioButtonPreferenceWithExtraWidget(mPreferenceCategory.getContext());
+    private RadioButtonPreference makeRadioPreference(String key, int titleId) {
+        final RadioButtonPreference pref =
+                new RadioButtonPreference(mPreferenceCategory.getContext());
         pref.setKey(key);
         pref.setTitle(titleId);
         pref.setOnClickListener(mRadioButtonClickListener);
@@ -179,9 +175,6 @@
         View.OnClickListener widgetClickListener = getWidgetClickListener(key);
         if (widgetClickListener != null) {
             pref.setExtraWidgetOnClickListener(widgetClickListener);
-            pref.setExtraWidgetVisibility(EXTRA_WIDGET_VISIBILITY_SETTING);
-        } else {
-            pref.setExtraWidgetVisibility(EXTRA_WIDGET_VISIBILITY_GONE);
         }
 
         mPreferenceCategory.addPreference(pref);
diff --git a/src/com/android/settings/notification/zen/ZenModeVisEffectsAllPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeVisEffectsAllPreferenceController.java
index f729be8..735ce79 100644
--- a/src/com/android/settings/notification/zen/ZenModeVisEffectsAllPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeVisEffectsAllPreferenceController.java
@@ -24,12 +24,13 @@
 import androidx.preference.PreferenceScreen;
 
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 public class ZenModeVisEffectsAllPreferenceController
         extends AbstractZenModePreferenceController
-        implements ZenCustomRadioButtonPreference.OnRadioButtonClickListener {
+        implements RadioButtonPreference.OnClickListener {
 
-    private ZenCustomRadioButtonPreference mPreference;
+    private RadioButtonPreference mPreference;
 
     protected static final int EFFECTS = Policy.SUPPRESSED_EFFECT_SCREEN_OFF
             | Policy.SUPPRESSED_EFFECT_SCREEN_ON
@@ -50,7 +51,7 @@
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
         mPreference = screen.findPreference(getPreferenceKey());
-        mPreference.setOnRadioButtonClickListener(this);
+        mPreference.setOnClickListener(this);
     }
 
     @Override
@@ -68,7 +69,7 @@
     }
 
     @Override
-    public void onRadioButtonClick(ZenCustomRadioButtonPreference p) {
+    public void onRadioButtonClicked(RadioButtonPreference p) {
         mMetricsFeatureProvider.action(mContext,
                 SettingsEnums.ACTION_ZEN_SOUND_AND_VIS_EFFECTS, true);
         mBackend.saveVisualEffectsPolicy(EFFECTS, true);
diff --git a/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceController.java
index a772eb5..535dca3 100644
--- a/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceController.java
@@ -26,11 +26,12 @@
 import com.android.settings.R;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 public class ZenModeVisEffectsCustomPreferenceController
         extends AbstractZenModePreferenceController {
 
-    private ZenCustomRadioButtonPreference mPreference;
+    private RadioButtonPreference mPreference;
 
     protected static final int INTERRUPTIVE_EFFECTS =
             NotificationManager.Policy.SUPPRESSED_EFFECT_AMBIENT
@@ -53,12 +54,11 @@
         super.displayPreference(screen);
         mPreference = screen.findPreference(getPreferenceKey());
 
-        mPreference.setOnGearClickListener(p -> {
+        mPreference.setExtraWidgetOnClickListener(p -> {
             launchCustomSettings();
-
         });
 
-        mPreference.setOnRadioButtonClickListener(p -> {
+        mPreference.setOnClickListener(p -> {
             launchCustomSettings();
         });
     }
diff --git a/src/com/android/settings/notification/zen/ZenModeVisEffectsNonePreferenceController.java b/src/com/android/settings/notification/zen/ZenModeVisEffectsNonePreferenceController.java
index 84037b9..8723ea8 100644
--- a/src/com/android/settings/notification/zen/ZenModeVisEffectsNonePreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeVisEffectsNonePreferenceController.java
@@ -24,12 +24,13 @@
 import androidx.preference.PreferenceScreen;
 
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 public class ZenModeVisEffectsNonePreferenceController
         extends AbstractZenModePreferenceController
-        implements ZenCustomRadioButtonPreference.OnRadioButtonClickListener {
+        implements RadioButtonPreference.OnClickListener {
 
-    private ZenCustomRadioButtonPreference mPreference;
+    private RadioButtonPreference mPreference;
 
     protected static final int EFFECTS = Policy.SUPPRESSED_EFFECT_SCREEN_OFF
             | Policy.SUPPRESSED_EFFECT_SCREEN_ON
@@ -50,7 +51,7 @@
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
         mPreference = screen.findPreference(getPreferenceKey());
-        mPreference.setOnRadioButtonClickListener(this);
+        mPreference.setOnClickListener(this);
     }
 
     @Override
@@ -67,7 +68,7 @@
     }
 
     @Override
-    public void onRadioButtonClick(ZenCustomRadioButtonPreference preference) {
+    public void onRadioButtonClicked(RadioButtonPreference preference) {
         mMetricsFeatureProvider.action(mContext,
                 SettingsEnums.ACTION_ZEN_SOUND_ONLY, true);
         mBackend.saveVisualEffectsPolicy(EFFECTS, false);
diff --git a/src/com/android/settings/notification/zen/ZenRuleCustomPolicyPreferenceController.java b/src/com/android/settings/notification/zen/ZenRuleCustomPolicyPreferenceController.java
index 56b98ff..2cf8679 100644
--- a/src/com/android/settings/notification/zen/ZenRuleCustomPolicyPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenRuleCustomPolicyPreferenceController.java
@@ -25,11 +25,12 @@
 
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 public class ZenRuleCustomPolicyPreferenceController extends
         AbstractZenCustomRulePreferenceController {
 
-    private ZenCustomRadioButtonPreference mPreference;
+    private RadioButtonPreference mPreference;
 
     public ZenRuleCustomPolicyPreferenceController(Context context, Lifecycle lifecycle,
             String key) {
@@ -41,13 +42,12 @@
         super.displayPreference(screen);
         mPreference = screen.findPreference(getPreferenceKey());
 
-        mPreference.setOnGearClickListener(p -> {
+        mPreference.setExtraWidgetOnClickListener(p -> {
             setCustomPolicy();
             launchCustomSettings();
-
         });
 
-        mPreference.setOnRadioButtonClickListener(p -> {
+        mPreference.setOnClickListener(p -> {
             setCustomPolicy();
             launchCustomSettings();
         });
diff --git a/src/com/android/settings/notification/zen/ZenRuleDefaultPolicyPreferenceController.java b/src/com/android/settings/notification/zen/ZenRuleDefaultPolicyPreferenceController.java
index 268156b..372f152 100644
--- a/src/com/android/settings/notification/zen/ZenRuleDefaultPolicyPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenRuleDefaultPolicyPreferenceController.java
@@ -26,11 +26,12 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 public class ZenRuleDefaultPolicyPreferenceController extends
         AbstractZenCustomRulePreferenceController implements PreferenceControllerMixin {
 
-    private ZenCustomRadioButtonPreference mPreference;
+    private RadioButtonPreference mPreference;
 
     public ZenRuleDefaultPolicyPreferenceController(Context context, Lifecycle lifecycle,
             String key) {
@@ -42,7 +43,7 @@
         super.displayPreference(screen);
         mPreference = screen.findPreference(getPreferenceKey());
 
-        mPreference.setOnRadioButtonClickListener(p -> {
+        mPreference.setOnClickListener(p -> {
             mRule.setZenPolicy(null);
             mBackend.updateZenRule(mId, mRule);
         });
diff --git a/src/com/android/settings/notification/zen/ZenRuleVisEffectsAllPreferenceController.java b/src/com/android/settings/notification/zen/ZenRuleVisEffectsAllPreferenceController.java
index fb46209..6e9152f 100644
--- a/src/com/android/settings/notification/zen/ZenRuleVisEffectsAllPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenRuleVisEffectsAllPreferenceController.java
@@ -27,11 +27,12 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 public class ZenRuleVisEffectsAllPreferenceController extends
         AbstractZenCustomRulePreferenceController implements PreferenceControllerMixin {
 
-    private ZenCustomRadioButtonPreference mPreference;
+    private RadioButtonPreference mPreference;
 
     public ZenRuleVisEffectsAllPreferenceController(Context context, Lifecycle lifecycle,
             String key) {
@@ -43,7 +44,7 @@
         super.displayPreference(screen);
         mPreference = screen.findPreference(getPreferenceKey());
 
-        mPreference.setOnRadioButtonClickListener(p -> {
+        mPreference.setOnClickListener(p -> {
             mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_ZEN_SOUND_ONLY,
                     Pair.create(MetricsProto.MetricsEvent.FIELD_ZEN_RULE_ID, mId));
             mRule.setZenPolicy(new ZenPolicy.Builder(mRule.getZenPolicy())
diff --git a/src/com/android/settings/notification/zen/ZenRuleVisEffectsCustomPreferenceController.java b/src/com/android/settings/notification/zen/ZenRuleVisEffectsCustomPreferenceController.java
index 68ab818..d7c5f86 100644
--- a/src/com/android/settings/notification/zen/ZenRuleVisEffectsCustomPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenRuleVisEffectsCustomPreferenceController.java
@@ -27,11 +27,12 @@
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 public class ZenRuleVisEffectsCustomPreferenceController extends
         AbstractZenCustomRulePreferenceController implements PreferenceControllerMixin {
 
-    private ZenCustomRadioButtonPreference mPreference;
+    private RadioButtonPreference mPreference;
 
     public ZenRuleVisEffectsCustomPreferenceController(Context context, Lifecycle lifecycle,
             String key) {
@@ -43,12 +44,12 @@
         super.displayPreference(screen);
         mPreference = screen.findPreference(getPreferenceKey());
 
-        mPreference.setOnGearClickListener(p -> {
+        mPreference.setOnClickListener(p -> {
             launchCustomSettings();
 
         });
 
-        mPreference.setOnRadioButtonClickListener(p -> {
+        mPreference.setExtraWidgetOnClickListener(p -> {
             launchCustomSettings();
         });
     }
diff --git a/src/com/android/settings/notification/zen/ZenRuleVisEffectsNonePreferenceController.java b/src/com/android/settings/notification/zen/ZenRuleVisEffectsNonePreferenceController.java
index cb3e690..5484ed5 100644
--- a/src/com/android/settings/notification/zen/ZenRuleVisEffectsNonePreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenRuleVisEffectsNonePreferenceController.java
@@ -27,11 +27,12 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 public class ZenRuleVisEffectsNonePreferenceController extends
         AbstractZenCustomRulePreferenceController implements PreferenceControllerMixin {
 
-    private ZenCustomRadioButtonPreference mPreference;
+    private RadioButtonPreference mPreference;
 
     public ZenRuleVisEffectsNonePreferenceController(Context context, Lifecycle lifecycle,
             String key) {
@@ -43,7 +44,7 @@
         super.displayPreference(screen);
         mPreference = screen.findPreference(getPreferenceKey());
 
-        mPreference.setOnRadioButtonClickListener(p -> {
+        mPreference.setOnClickListener(p -> {
             mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_ZEN_SOUND_AND_VIS_EFFECTS,
                     Pair.create(MetricsProto.MetricsEvent.FIELD_ZEN_RULE_ID, mId));
             mRule.setZenPolicy(new ZenPolicy.Builder(mRule.getZenPolicy())
diff --git a/src/com/android/settings/overlay/FeatureFactory.java b/src/com/android/settings/overlay/FeatureFactory.java
index b9aa68a..a15075e 100644
--- a/src/com/android/settings/overlay/FeatureFactory.java
+++ b/src/com/android/settings/overlay/FeatureFactory.java
@@ -41,6 +41,7 @@
 import com.android.settings.security.SecurityFeatureProvider;
 import com.android.settings.slices.SlicesFeatureProvider;
 import com.android.settings.users.UserFeatureProvider;
+import com.android.settings.wifi.WifiTrackerLibProvider;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
 /**
@@ -143,6 +144,11 @@
 
     public abstract FaceFeatureProvider getFaceFeatureProvider();
 
+    /**
+     * Gets implementation for the WifiTrackerLib.
+     */
+    public abstract WifiTrackerLibProvider getWifiTrackerLibProvider();
+
     public static final class FactoryNotFoundException extends RuntimeException {
         public FactoryNotFoundException(Throwable throwable) {
             super("Unable to create factory. Did you misconfigure Proguard?", throwable);
diff --git a/src/com/android/settings/overlay/FeatureFactoryImpl.java b/src/com/android/settings/overlay/FeatureFactoryImpl.java
index d4d396f..ebbe87c 100644
--- a/src/com/android/settings/overlay/FeatureFactoryImpl.java
+++ b/src/com/android/settings/overlay/FeatureFactoryImpl.java
@@ -62,6 +62,8 @@
 import com.android.settings.slices.SlicesFeatureProviderImpl;
 import com.android.settings.users.UserFeatureProvider;
 import com.android.settings.users.UserFeatureProviderImpl;
+import com.android.settings.wifi.WifiTrackerLibProvider;
+import com.android.settings.wifi.WifiTrackerLibProviderImpl;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
 /**
@@ -90,6 +92,7 @@
     private BluetoothFeatureProvider mBluetoothFeatureProvider;
     private AwareFeatureProvider mAwareFeatureProvider;
     private FaceFeatureProvider mFaceFeatureProvider;
+    private WifiTrackerLibProvider mWifiTrackerLibProvider;
 
     @Override
     public SupportFeatureProvider getSupportFeatureProvider(Context context) {
@@ -278,4 +281,12 @@
         }
         return mFaceFeatureProvider;
     }
+
+    @Override
+    public WifiTrackerLibProvider getWifiTrackerLibProvider() {
+        if (mWifiTrackerLibProvider == null) {
+            mWifiTrackerLibProvider = new WifiTrackerLibProviderImpl();
+        }
+        return mWifiTrackerLibProvider;
+    }
 }
diff --git a/src/com/android/settings/panel/PanelFeatureProviderImpl.java b/src/com/android/settings/panel/PanelFeatureProviderImpl.java
index ca30952..28c4ba1 100644
--- a/src/com/android/settings/panel/PanelFeatureProviderImpl.java
+++ b/src/com/android/settings/panel/PanelFeatureProviderImpl.java
@@ -20,6 +20,8 @@
 import android.os.Bundle;
 import android.provider.Settings;
 
+import com.android.settings.Utils;
+
 public class PanelFeatureProviderImpl implements PanelFeatureProvider {
 
     @Override
@@ -39,6 +41,9 @@
             case Settings.Panel.ACTION_NFC:
                 return NfcPanel.create(context);
             case Settings.Panel.ACTION_WIFI:
+                if (Utils.isProviderModelEnabled(context)) {
+                    return InternetConnectivityPanel.create(context);
+                }
                 return WifiPanel.create(context);
             case Settings.Panel.ACTION_VOLUME:
                 return VolumePanel.create(context);
diff --git a/src/com/android/settings/search/SearchFeatureProvider.java b/src/com/android/settings/search/SearchFeatureProvider.java
index 20d4e7c..18c802c 100644
--- a/src/com/android/settings/search/SearchFeatureProvider.java
+++ b/src/com/android/settings/search/SearchFeatureProvider.java
@@ -20,11 +20,13 @@
 
 import android.annotation.NonNull;
 import android.app.Activity;
+import android.app.ActivityOptions;
 import android.app.settings.SettingsEnums;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Toolbar;
@@ -100,7 +102,8 @@
                     .indexSliceDataAsync(context);
             FeatureFactory.getFactory(context).getMetricsFeatureProvider()
                     .action(context, SettingsEnums.ACTION_SEARCH_RESULTS);
-            activity.startActivityForResult(intent, REQUEST_CODE);
+            final Bundle bundle = ActivityOptions.makeSceneTransitionAnimation(activity).toBundle();
+            activity.startActivityForResult(intent, REQUEST_CODE, bundle);
         });
     }
 
diff --git a/src/com/android/settings/security/RequestManageCredentials.java b/src/com/android/settings/security/RequestManageCredentials.java
index b30f5b6..56fa83d 100644
--- a/src/com/android/settings/security/RequestManageCredentials.java
+++ b/src/com/android/settings/security/RequestManageCredentials.java
@@ -19,17 +19,25 @@
 import android.annotation.Nullable;
 import android.app.Activity;
 import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.content.pm.UserInfo;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Process;
+import android.os.RemoteException;
+import android.os.UserManager;
 import android.security.AppUriAuthenticationPolicy;
 import android.security.Credentials;
 import android.security.KeyChain;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.LinearLayout;
-import android.widget.Toast;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -66,29 +74,98 @@
     private LinearLayout mButtonPanel;
     private ExtendedFloatingActionButton mExtendedFab;
 
+    private HandlerThread mKeyChainTread;
+    private KeyChain.KeyChainConnection mKeyChainConnection;
+
     private boolean mDisplayingButtonPanel = false;
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        if (Credentials.ACTION_MANAGE_CREDENTIALS.equals(getIntent().getAction())) {
-            setContentView(R.layout.request_manage_credentials);
-            // This is not authenticated, as any app can ask to be the credential management app.
-            mCredentialManagerPackage = getReferrer().getHost();
-            mAuthenticationPolicy =
-                    getIntent().getParcelableExtra(KeyChain.EXTRA_AUTHENTICATION_POLICY);
-            enforceValidAuthenticationPolicy(mAuthenticationPolicy);
-
-            loadRecyclerView();
-            loadButtons();
-            loadExtendedFloatingActionButton();
-            addOnScrollListener();
-        } else {
+        if (!Credentials.ACTION_MANAGE_CREDENTIALS.equals(getIntent().getAction())) {
             Log.e(TAG, "Unable to start activity because intent action is not "
                     + Credentials.ACTION_MANAGE_CREDENTIALS);
-            finish();
+            finishWithResultCancelled();
+            return;
         }
+        if (isManagedDevice()) {
+            Log.e(TAG, "Credential management on managed devices should be done by the Device "
+                    + "Policy Controller, not a credential management app");
+            finishWithResultCancelled();
+            return;
+        }
+        mCredentialManagerPackage = getLaunchedFromPackage();
+        if (TextUtils.isEmpty(mCredentialManagerPackage)) {
+            Log.e(TAG, "Unknown credential manager app");
+            finishWithResultCancelled();
+            return;
+        }
+        setContentView(R.layout.request_manage_credentials);
+
+        mKeyChainTread = new HandlerThread("KeyChainConnection");
+        mKeyChainTread.start();
+        mKeyChainConnection = getKeyChainConnection(this, mKeyChainTread);
+
+        AppUriAuthenticationPolicy policy =
+                getIntent().getParcelableExtra(KeyChain.EXTRA_AUTHENTICATION_POLICY);
+        if (!isValidAuthenticationPolicy(policy)) {
+            Log.e(TAG, "Invalid authentication policy");
+            finishWithResultCancelled();
+            return;
+        }
+        mAuthenticationPolicy = policy;
+
+        loadRecyclerView();
+        loadButtons();
+        loadExtendedFloatingActionButton();
+        addOnScrollListener();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (mKeyChainConnection != null) {
+            mKeyChainConnection.close();
+            mKeyChainConnection = null;
+            mKeyChainTread.quitSafely();
+        }
+    }
+
+    private boolean isValidAuthenticationPolicy(AppUriAuthenticationPolicy policy) {
+        if (policy == null || policy.getAppAndUriMappings().isEmpty()) {
+            return false;
+        }
+        try {
+            // Check whether any of the aliases in the policy already exist
+            for (String alias : policy.getAliases()) {
+                if (mKeyChainConnection.getService().requestPrivateKey(alias) != null) {
+                    return false;
+                }
+            }
+        } catch (RemoteException e) {
+            Log.e(TAG, "Invalid authentication policy", e);
+            return false;
+        }
+        return true;
+    }
+
+    private boolean isManagedDevice() {
+        DevicePolicyManager dpm = getSystemService(DevicePolicyManager.class);
+
+        return dpm.getDeviceOwnerUser() != null
+                || dpm.getProfileOwner() != null
+                || hasManagedProfile();
+    }
+
+    private boolean hasManagedProfile() {
+        UserManager um = getSystemService(UserManager.class);
+        for (final UserInfo userInfo : um.getProfiles(getUserId())) {
+            if (userInfo.isManagedProfile()) {
+                return true;
+            }
+        }
+        return false;
     }
 
     private void loadRecyclerView() {
@@ -107,8 +184,10 @@
         Button dontAllowButton = findViewById(R.id.dont_allow_button);
         Button allowButton = findViewById(R.id.allow_button);
 
-        dontAllowButton.setOnClickListener(finishRequestManageCredentials());
-        allowButton.setOnClickListener(setCredentialManagementApp());
+        dontAllowButton.setOnClickListener(b -> {
+            finishWithResultCancelled();
+        });
+        allowButton.setOnClickListener(b -> setOrUpdateCredentialManagementApp());
     }
 
     private void loadExtendedFloatingActionButton() {
@@ -120,22 +199,26 @@
         });
     }
 
-    private View.OnClickListener finishRequestManageCredentials() {
-        return v -> {
-            Toast.makeText(this, R.string.request_manage_credentials_dont_allow,
-                    Toast.LENGTH_SHORT).show();
-            setResult(RESULT_CANCELED);
-            finish();
-        };
+    private void setOrUpdateCredentialManagementApp() {
+        try {
+            mKeyChainConnection.getService().setCredentialManagementApp(
+                    mCredentialManagerPackage, mAuthenticationPolicy);
+        } catch (RemoteException e) {
+            Log.e(TAG, "Unable to set credential manager app", e);
+        }
+        finish();
     }
 
-    private View.OnClickListener setCredentialManagementApp() {
-        return v -> {
-            // TODO: Implement allow logic
-            Toast.makeText(this, R.string.request_manage_credentials_allow,
-                    Toast.LENGTH_SHORT).show();
-            finish();
-        };
+    @VisibleForTesting
+    KeyChain.KeyChainConnection getKeyChainConnection(Context context, HandlerThread thread) {
+        final Handler handler = new Handler(thread.getLooper());
+        try {
+            KeyChain.KeyChainConnection connection = KeyChain.bindAsUser(
+                    context, handler, Process.myUserHandle());
+            return connection;
+        } catch (InterruptedException e) {
+            throw new RuntimeException("Faile to bind to KeyChain", e);
+        }
     }
 
     private void addOnScrollListener() {
@@ -182,12 +265,8 @@
                 < mRecyclerView.getAdapter().getItemCount() - 1;
     }
 
-    private void enforceValidAuthenticationPolicy(AppUriAuthenticationPolicy policy) {
-        // TODO: Check whether any of the aliases in the policy already exist
-        if (policy == null || policy.getAppAndUriMappings().isEmpty()) {
-            Log.e(TAG, "Invalid authentication policy");
-            setResult(RESULT_CANCELED);
-            finish();
-        }
+    private void finishWithResultCancelled() {
+        setResult(RESULT_CANCELED);
+        finish();
     }
 }
diff --git a/src/com/android/settings/slices/SettingsSliceProvider.java b/src/com/android/settings/slices/SettingsSliceProvider.java
index 0c6205f..7c487ba 100644
--- a/src/com/android/settings/slices/SettingsSliceProvider.java
+++ b/src/com/android/settings/slices/SettingsSliceProvider.java
@@ -343,7 +343,7 @@
         final Intent settingsIntent = new Intent(Settings.ACTION_SETTINGS)
                 .setPackage(Utils.SETTINGS_PACKAGE_NAME);
         final PendingIntent noOpIntent = PendingIntent.getActivity(getContext(),
-                0 /* requestCode */, settingsIntent, 0 /* flags */);
+                0 /* requestCode */, settingsIntent, PendingIntent.FLAG_IMMUTABLE);
         return noOpIntent;
     }
 
diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java
index 53d9849..5005399 100644
--- a/src/com/android/settings/users/UserDetailsSettings.java
+++ b/src/com/android/settings/users/UserDetailsSettings.java
@@ -243,7 +243,7 @@
                 mDefaultGuestRestrictions = mUserManager.getDefaultGuestRestrictions();
                 mPhonePref.setChecked(
                         !mDefaultGuestRestrictions.getBoolean(UserManager.DISALLOW_OUTGOING_CALLS));
-                mRemoveUserPref.setTitle(R.string.user_exit_guest_title);
+                mRemoveUserPref.setTitle(R.string.user_exit_guest_menu);
             } else {
                 mPhonePref.setChecked(!mUserManager.hasUserRestriction(
                         UserManager.DISALLOW_OUTGOING_CALLS, new UserHandle(userId)));
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 63ccb6b..8ba5432 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -31,6 +31,7 @@
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.AsyncTask;
@@ -164,6 +165,7 @@
     private final Object mUserLock = new Object();
     private UserManager mUserManager;
     private static SparseArray<Bitmap> sDarkDefaultUserBitmapCache = new SparseArray<>();
+    private static Bitmap sRemoveGuestBitmap = null;
 
     private MultiUserSwitchBarController mSwitchBarController;
     private EditUserInfoController mEditUserInfoController =
@@ -177,6 +179,7 @@
 
     // A place to cache the generated default avatar
     private Drawable mDefaultIconDrawable;
+    private Drawable mRemoveGuestIconDrawable;
 
     // TODO:   Replace current Handler solution to something that doesn't leak memory and works
     // TODO:   during a configuration change
@@ -383,8 +386,8 @@
     private void loadProfile() {
         if (isCurrentUserGuest()) {
             // No need to load profile information
-            mMePreference.setIcon(getEncircledDefaultIcon());
-            mMePreference.setTitle(R.string.user_exit_guest_title);
+            mMePreference.setIcon(getEncircledRemoveGuestIcon());
+            mMePreference.setTitle(R.string.user_clear_guest_menu);
             mMePreference.setSelectable(true);
             // removing a guest will result in switching back to the admin user
             mMePreference.setEnabled(canSwitchUserNow());
@@ -899,7 +902,7 @@
                 } else {
                     setPhotoId(pref, user);
                 }
-            } else {
+            } else if (!user.isGuest()) {
                 // Icon not available yet, print a placeholder
                 pref.setIcon(getEncircledDefaultIcon());
             }
@@ -1044,6 +1047,14 @@
         return mDefaultIconDrawable;
     }
 
+    private Drawable getEncircledRemoveGuestIcon() {
+        if (mRemoveGuestIconDrawable == null) {
+            mRemoveGuestIconDrawable = encircle(
+                    getRemoveGuestIconAsBitmap(getContext().getResources()));
+        }
+        return mRemoveGuestIconDrawable;
+    }
+
     private void setPhotoId(Preference pref, UserInfo user) {
         Bitmap bitmap = mUserIcons.get(user.id);
         if (bitmap != null) {
@@ -1123,6 +1134,23 @@
     }
 
     /**
+     * Returns a remove guest icon (as a {@link Bitmap})
+     *
+     * @param resources resources object to fetch the remove guest icon.
+     */
+    private static Bitmap getRemoveGuestIconAsBitmap(Resources resources) {
+        if (sRemoveGuestBitmap == null) {
+            Drawable icon = resources.getDrawable(R.drawable.ic_delete, null).mutate();
+            icon.setColorFilter(
+                    resources.getColor(com.android.internal.R.color.user_icon_default_gray, null),
+                    PorterDuff.Mode.SRC_IN);
+            icon.setBounds(0, 0, icon.getIntrinsicWidth(), icon.getIntrinsicHeight());
+            sRemoveGuestBitmap = UserIcons.convertToBitmap(icon);
+        }
+        return sRemoveGuestBitmap;
+    }
+
+    /**
      * Assign the default photo to user with {@paramref userId}
      *
      * @param context used to get the {@link UserManager}
diff --git a/src/com/android/settings/widget/RadioButtonPreferenceWithExtraWidget.java b/src/com/android/settings/widget/RadioButtonPreferenceWithExtraWidget.java
deleted file mode 100644
index 2b28ec1..0000000
--- a/src/com/android/settings/widget/RadioButtonPreferenceWithExtraWidget.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2019 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.widget;
-
-import android.content.Context;
-import android.view.View;
-import android.widget.ImageView;
-
-import androidx.preference.PreferenceViewHolder;
-
-import com.android.settings.R;
-import com.android.settingslib.widget.RadioButtonPreference;
-
-public class RadioButtonPreferenceWithExtraWidget extends RadioButtonPreference {
-    public static final int EXTRA_WIDGET_VISIBILITY_GONE = 0;
-    public static final int EXTRA_WIDGET_VISIBILITY_INFO = 1;
-    public static final int EXTRA_WIDGET_VISIBILITY_SETTING = 2;
-
-    private View mExtraWidgetDivider;
-    private ImageView mExtraWidget;
-
-    private int mExtraWidgetVisibility = EXTRA_WIDGET_VISIBILITY_GONE;
-    private View.OnClickListener mExtraWidgetOnClickListener;
-
-    public RadioButtonPreferenceWithExtraWidget(Context context) {
-        super(context, null);
-        setLayoutResource(R.layout.preference_radio_with_extra_widget);
-    }
-
-    @Override
-    public void onBindViewHolder(PreferenceViewHolder view) {
-        super.onBindViewHolder(view);
-
-        mExtraWidget = (ImageView) view.findViewById(R.id.radio_extra_widget);
-        mExtraWidgetDivider = view.findViewById(R.id.radio_extra_widget_divider);
-        setExtraWidgetVisibility(mExtraWidgetVisibility);
-
-        if (mExtraWidgetOnClickListener != null) {
-            setExtraWidgetOnClickListener(mExtraWidgetOnClickListener);
-        }
-    }
-
-    public void setExtraWidgetVisibility(int visibility) {
-        mExtraWidgetVisibility = visibility;
-        if (mExtraWidget == null || mExtraWidgetDivider == null) {
-            return;
-        }
-
-        if (visibility == EXTRA_WIDGET_VISIBILITY_GONE) {
-            mExtraWidget.setClickable(false);
-            mExtraWidget.setVisibility(View.GONE);
-            mExtraWidgetDivider.setVisibility(View.GONE);
-        } else {
-            mExtraWidget.setClickable(true);
-            mExtraWidget.setVisibility(View.VISIBLE);
-            mExtraWidgetDivider.setVisibility(View.VISIBLE);
-            if (mExtraWidgetVisibility == EXTRA_WIDGET_VISIBILITY_INFO) {
-                mExtraWidget.setImageResource(R.drawable.ic_settings_about);
-                mExtraWidget.setContentDescription(
-                        getContext().getResources().getText(R.string.information_label));
-            } else if (mExtraWidgetVisibility == EXTRA_WIDGET_VISIBILITY_SETTING) {
-                mExtraWidget.setImageResource(R.drawable.ic_settings_accent);
-                mExtraWidget.setContentDescription(
-                        getContext().getResources().getText(R.string.settings_label));
-            }
-        }
-    }
-
-    public void setExtraWidgetOnClickListener(View.OnClickListener listener) {
-        mExtraWidgetOnClickListener = listener;
-        if (mExtraWidget != null) {
-            mExtraWidget.setEnabled(true);
-            mExtraWidget.setOnClickListener(listener);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/com/android/settings/wifi/ConfigureWifiEntryFragment.java b/src/com/android/settings/wifi/ConfigureWifiEntryFragment.java
index 881aaea..c36a298 100644
--- a/src/com/android/settings/wifi/ConfigureWifiEntryFragment.java
+++ b/src/com/android/settings/wifi/ConfigureWifiEntryFragment.java
@@ -21,9 +21,6 @@
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.Intent;
-import android.net.ConnectivityManager;
-import android.net.NetworkScoreManager;
-import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.HandlerThread;
@@ -40,6 +37,7 @@
 
 import com.android.settings.R;
 import com.android.settings.core.InstrumentedFragment;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.wifi.details2.WifiNetworkDetailsFragment2;
 import com.android.wifitrackerlib.NetworkDetailsTracker;
 import com.android.wifitrackerlib.WifiEntry;
@@ -222,17 +220,17 @@
             }
         };
 
-        mNetworkDetailsTracker = NetworkDetailsTracker.createNetworkDetailsTracker(
-                getSettingsLifecycle(),
-                context,
-                context.getSystemService(WifiManager.class),
-                context.getSystemService(ConnectivityManager.class),
-                context.getSystemService(NetworkScoreManager.class),
-                new Handler(Looper.getMainLooper()),
-                mWorkerThread.getThreadHandler(),
-                elapsedRealtimeClock,
-                MAX_SCAN_AGE_MILLIS,
-                SCAN_INTERVAL_MILLIS,
-                getArguments().getString(WifiNetworkDetailsFragment2.KEY_CHOSEN_WIFIENTRY_KEY));
+        mNetworkDetailsTracker = FeatureFactory.getFactory(context)
+                .getWifiTrackerLibProvider()
+                .createNetworkDetailsTracker(
+                        getSettingsLifecycle(),
+                        context,
+                        new Handler(Looper.getMainLooper()),
+                        mWorkerThread.getThreadHandler(),
+                        elapsedRealtimeClock,
+                        MAX_SCAN_AGE_MILLIS,
+                        SCAN_INTERVAL_MILLIS,
+                        getArguments().getString(
+                                WifiNetworkDetailsFragment2.KEY_CHOSEN_WIFIENTRY_KEY));
     }
 }
diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java
index 81ca183..ff313c7 100644
--- a/src/com/android/settings/wifi/ConfigureWifiSettings.java
+++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java
@@ -63,18 +63,6 @@
     }
 
     @Override
-    public int getInitialExpandedChildCount() {
-        int tileLimit = 1;
-        if (mWifiWakeupPreferenceController.isAvailable()) {
-            tileLimit++;
-        }
-        if (mUseOpenWifiPreferenceController.isAvailable()) {
-            tileLimit++;
-        }
-        return tileLimit;
-    }
-
-    @Override
     protected int getPreferenceScreenResId() {
         return R.xml.wifi_configure_settings;
     }
diff --git a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java
index 887f09f..11f3612 100644
--- a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java
+++ b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java
@@ -24,11 +24,8 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.graphics.drawable.Drawable;
-import android.net.ConnectivityManager;
-import android.net.NetworkScoreManager;
 import android.net.wifi.ScanResult;
 import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
 import android.net.wifi.WifiManager.NetworkRequestMatchCallback;
 import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;
 import android.os.Bundle;
@@ -54,6 +51,7 @@
 import androidx.preference.internal.PreferenceImageView;
 
 import com.android.settings.R;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.Utils;
 import com.android.wifitrackerlib.WifiEntry;
 import com.android.wifitrackerlib.WifiPickerTracker;
@@ -113,16 +111,15 @@
             }
         };
         final Context context = getContext();
-        mWifiPickerTracker = new WifiPickerTracker(getSettingsLifecycle(), context,
-                context.getSystemService(WifiManager.class),
-                context.getSystemService(ConnectivityManager.class),
-                context.getSystemService(NetworkScoreManager.class),
-                new Handler(Looper.getMainLooper()),
-                mWorkerThread.getThreadHandler(),
-                elapsedRealtimeClock,
-                MAX_SCAN_AGE_MILLIS,
-                SCAN_INTERVAL_MILLIS,
-                this);
+        mWifiPickerTracker = FeatureFactory.getFactory(context)
+                .getWifiTrackerLibProvider()
+                .createWifiPickerTracker(getSettingsLifecycle(), context,
+                        new Handler(Looper.getMainLooper()),
+                        mWorkerThread.getThreadHandler(),
+                        elapsedRealtimeClock,
+                        MAX_SCAN_AGE_MILLIS,
+                        SCAN_INTERVAL_MILLIS,
+                        this);
     }
 
     @Override
diff --git a/src/com/android/settings/wifi/WifiConnectionPreferenceController.java b/src/com/android/settings/wifi/WifiConnectionPreferenceController.java
index 13d5082..3b2669c 100644
--- a/src/com/android/settings/wifi/WifiConnectionPreferenceController.java
+++ b/src/com/android/settings/wifi/WifiConnectionPreferenceController.java
@@ -17,9 +17,6 @@
 package com.android.settings.wifi;
 
 import android.content.Context;
-import android.net.ConnectivityManager;
-import android.net.NetworkScoreManager;
-import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.HandlerThread;
@@ -36,6 +33,7 @@
 
 import com.android.settings.R;
 import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.wifi.details2.WifiNetworkDetailsFragment2;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -115,16 +113,15 @@
                 return SystemClock.elapsedRealtime();
             }
         };
-        mWifiPickerTracker = new WifiPickerTracker(lifecycle, context,
-                context.getSystemService(WifiManager.class),
-                context.getSystemService(ConnectivityManager.class),
-                context.getSystemService(NetworkScoreManager.class),
-                new Handler(Looper.getMainLooper()),
-                mWorkerThread.getThreadHandler(),
-                elapsedRealtimeClock,
-                MAX_SCAN_AGE_MILLIS,
-                SCAN_INTERVAL_MILLIS,
-                this);
+        mWifiPickerTracker = FeatureFactory.getFactory(context)
+                .getWifiTrackerLibProvider()
+                .createWifiPickerTracker(lifecycle, context,
+                        new Handler(Looper.getMainLooper()),
+                        mWorkerThread.getThreadHandler(),
+                        elapsedRealtimeClock,
+                        MAX_SCAN_AGE_MILLIS,
+                        SCAN_INTERVAL_MILLIS,
+                        this);
     }
 
     /**
diff --git a/src/com/android/settings/wifi/WifiDialogActivity.java b/src/com/android/settings/wifi/WifiDialogActivity.java
index 000ed3e..1c5a8ed 100644
--- a/src/com/android/settings/wifi/WifiDialogActivity.java
+++ b/src/com/android/settings/wifi/WifiDialogActivity.java
@@ -18,9 +18,7 @@
 
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
-import android.net.NetworkScoreManager;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
 import android.net.wifi.WifiManager.ActionListener;
@@ -38,6 +36,7 @@
 
 import com.android.settings.R;
 import com.android.settings.SetupWizardUtils;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.wifi.dpp.WifiDppUtils;
 import com.android.settingslib.core.lifecycle.ObservableActivity;
 import com.android.settingslib.wifi.AccessPoint;
@@ -124,18 +123,17 @@
                     return SystemClock.elapsedRealtime();
                 }
             };
-            mNetworkDetailsTracker = NetworkDetailsTracker.createNetworkDetailsTracker(
-                    getLifecycle(),
-                    this,
-                    getSystemService(WifiManager.class),
-                    getSystemService(ConnectivityManager.class),
-                    getSystemService(NetworkScoreManager.class),
-                    new Handler(Looper.getMainLooper()),
-                    mWorkerThread.getThreadHandler(),
-                    elapsedRealtimeClock,
-                    MAX_SCAN_AGE_MILLIS,
-                    SCAN_INTERVAL_MILLIS,
-                    mIntent.getStringExtra(KEY_CHOSEN_WIFIENTRY_KEY));
+            mNetworkDetailsTracker = FeatureFactory.getFactory(this)
+                    .getWifiTrackerLibProvider()
+                    .createNetworkDetailsTracker(
+                            getLifecycle(),
+                            this,
+                            new Handler(Looper.getMainLooper()),
+                            mWorkerThread.getThreadHandler(),
+                            elapsedRealtimeClock,
+                            MAX_SCAN_AGE_MILLIS,
+                            SCAN_INTERVAL_MILLIS,
+                            mIntent.getStringExtra(KEY_CHOSEN_WIFIENTRY_KEY));
         } else {
             final Bundle accessPointState = mIntent.getBundleExtra(KEY_ACCESS_POINT_STATE);
             if (accessPointState != null) {
diff --git a/src/com/android/settings/wifi/WifiPickerTrackerHelper.java b/src/com/android/settings/wifi/WifiPickerTrackerHelper.java
new file mode 100644
index 0000000..c20f355
--- /dev/null
+++ b/src/com/android/settings/wifi/WifiPickerTrackerHelper.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright (C) 2021 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.wifi;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.os.Process;
+import android.os.SimpleClock;
+import android.os.SystemClock;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.OnLifecycleEvent;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.wifitrackerlib.MergedCarrierEntry;
+import com.android.wifitrackerlib.WifiEntry;
+import com.android.wifitrackerlib.WifiPickerTracker;
+
+import java.time.Clock;
+import java.time.ZoneOffset;
+
+public class WifiPickerTrackerHelper implements LifecycleObserver {
+
+    private static final String TAG = "WifiPickerTrackerHelper";
+
+    // Max age of tracked WifiEntries
+    private static final long MAX_SCAN_AGE_MILLIS = 15_000;
+    // Interval between initiating WifiPickerTracker scans
+    private static final long SCAN_INTERVAL_MILLIS = 10_000;
+    // Clock used for evaluating the age of scans
+    private static final Clock ELAPSED_REALTIME_CLOCK = new SimpleClock(ZoneOffset.UTC) {
+        @Override
+        public long millis() {
+            return SystemClock.elapsedRealtime();
+        }
+    };
+
+    private WifiPickerTracker mWifiPickerTracker;
+    // Worker thread used for WifiPickerTracker work
+    private HandlerThread mWorkerThread;
+
+    public WifiPickerTrackerHelper(@NonNull Lifecycle lifecycle, @NonNull Context context,
+            @Nullable WifiPickerTracker.WifiPickerTrackerCallback listener) {
+        if (lifecycle == null) {
+            throw new IllegalArgumentException("lifecycle must be non-null.");
+        }
+        lifecycle.addObserver(this);
+        mWorkerThread = new HandlerThread(TAG
+                + "{" + Integer.toHexString(System.identityHashCode(this)) + "}",
+                Process.THREAD_PRIORITY_BACKGROUND);
+        mWorkerThread.start();
+
+        mWifiPickerTracker =  FeatureFactory.getFactory(context)
+                .getWifiTrackerLibProvider()
+                .createWifiPickerTracker(lifecycle, context,
+                new Handler(Looper.getMainLooper()),
+                mWorkerThread.getThreadHandler(),
+                ELAPSED_REALTIME_CLOCK,
+                MAX_SCAN_AGE_MILLIS,
+                SCAN_INTERVAL_MILLIS,
+                listener);
+
+    }
+
+    @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+    public void onDestroy() {
+        mWorkerThread.quit();
+    }
+
+    public @NonNull WifiPickerTracker getWifiPickerTracker() {
+        return mWifiPickerTracker;
+    }
+
+    public boolean setCarrierNetworkEnabled(boolean enable) {
+        final MergedCarrierEntry mergedCarrierEntry = mWifiPickerTracker.getMergedCarrierEntry();
+        if (mergedCarrierEntry == null) {
+            return false;
+        }
+        mergedCarrierEntry.setEnabled(enable);
+        return true;
+    }
+
+    public boolean connectCarrierNetwork(@Nullable WifiEntry.ConnectCallback callback) {
+        final MergedCarrierEntry mergedCarrierEntry = mWifiPickerTracker.getMergedCarrierEntry();
+        if (mergedCarrierEntry == null || !mergedCarrierEntry.canConnect()) {
+            return false;
+        }
+        mergedCarrierEntry.connect(callback);
+        return true;
+    }
+
+    @VisibleForTesting
+    void setWifiPickerTracker(@NonNull WifiPickerTracker wifiPickerTracker) {
+        mWifiPickerTracker = wifiPickerTracker;
+    }
+
+    @VisibleForTesting
+    void setWorkerThread(@NonNull HandlerThread workerThread) {
+        mWorkerThread = workerThread;
+    }
+}
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 2804393..cf8242b 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -27,8 +27,6 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.net.ConnectivityManager;
-import android.net.NetworkScoreManager;
 import android.net.NetworkTemplate;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
@@ -66,6 +64,7 @@
 import com.android.settings.datausage.DataUsagePreference;
 import com.android.settings.datausage.DataUsageUtils;
 import com.android.settings.location.ScanningSettings;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.widget.SwitchBarController;
 import com.android.settings.wifi.details2.WifiNetworkDetailsFragment2;
@@ -283,16 +282,15 @@
                 return SystemClock.elapsedRealtime();
             }
         };
-        mWifiPickerTracker = new WifiPickerTracker(getSettingsLifecycle(), context,
-                context.getSystemService(WifiManager.class),
-                context.getSystemService(ConnectivityManager.class),
-                context.getSystemService(NetworkScoreManager.class),
-                new Handler(Looper.getMainLooper()),
-                mWorkerThread.getThreadHandler(),
-                elapsedRealtimeClock,
-                MAX_SCAN_AGE_MILLIS,
-                SCAN_INTERVAL_MILLIS,
-                this);
+        mWifiPickerTracker = FeatureFactory.getFactory(context)
+                .getWifiTrackerLibProvider()
+                .createWifiPickerTracker(getSettingsLifecycle(), context,
+                        new Handler(Looper.getMainLooper()),
+                        mWorkerThread.getThreadHandler(),
+                        elapsedRealtimeClock,
+                        MAX_SCAN_AGE_MILLIS,
+                        SCAN_INTERVAL_MILLIS,
+                        this);
 
         final Activity activity = getActivity();
 
diff --git a/src/com/android/settings/wifi/WifiTrackerLibProvider.java b/src/com/android/settings/wifi/WifiTrackerLibProvider.java
new file mode 100644
index 0000000..10b3373
--- /dev/null
+++ b/src/com/android/settings/wifi/WifiTrackerLibProvider.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2020 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.wifi;
+
+import android.content.Context;
+import android.os.Handler;
+
+import androidx.lifecycle.Lifecycle;
+
+import com.android.wifitrackerlib.NetworkDetailsTracker;
+import com.android.wifitrackerlib.WifiPickerTracker;
+
+import java.time.Clock;
+
+/**
+ * Provides the objects instances from the AOSP WifiTrackerLib.
+ */
+public interface WifiTrackerLibProvider {
+
+    /** Create a new instance of WifiPickerTracker */
+    WifiPickerTracker createWifiPickerTracker(
+            Lifecycle lifecycle, Context context,
+            Handler mainHandler, Handler workerHandler, Clock clock,
+            long maxScanAgeMillis, long scanIntervalMillis,
+            WifiPickerTracker.WifiPickerTrackerCallback listener);
+
+    /** Create a new instance of NetworkDetailsTracker */
+    NetworkDetailsTracker createNetworkDetailsTracker(
+            Lifecycle lifecycle, Context context,
+            Handler mainHandler, Handler workerHandler, Clock clock,
+            long maxScanAgeMillis, long scanIntervalMillis,
+            String key);
+
+}
diff --git a/src/com/android/settings/wifi/WifiTrackerLibProviderImpl.java b/src/com/android/settings/wifi/WifiTrackerLibProviderImpl.java
new file mode 100644
index 0000000..f835409
--- /dev/null
+++ b/src/com/android/settings/wifi/WifiTrackerLibProviderImpl.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2020 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.wifi;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.NetworkScoreManager;
+import android.net.wifi.WifiManager;
+import android.os.Handler;
+
+import androidx.lifecycle.Lifecycle;
+
+import com.android.wifitrackerlib.NetworkDetailsTracker;
+import com.android.wifitrackerlib.WifiPickerTracker;
+
+import java.time.Clock;
+
+/**
+ * Implementation of AOSP WifiTrackerLibProvider.
+ */
+public class WifiTrackerLibProviderImpl implements WifiTrackerLibProvider {
+
+    /**
+     * Create an instance of WifiPickerTracker.
+     */
+    @Override
+    public WifiPickerTracker createWifiPickerTracker(
+            Lifecycle lifecycle, Context context,
+            Handler mainHandler, Handler workerHandler, Clock clock,
+            long maxScanAgeMillis, long scanIntervalMillis,
+            WifiPickerTracker.WifiPickerTrackerCallback listener) {
+        return new WifiPickerTracker(
+                lifecycle, context,
+                context.getSystemService(WifiManager.class),
+                context.getSystemService(ConnectivityManager.class),
+                context.getSystemService(NetworkScoreManager.class),
+                mainHandler, workerHandler, clock,
+                maxScanAgeMillis, scanIntervalMillis,
+                listener);
+    }
+
+    /**
+     * Create an instance of NetworkDetailsTracker.
+     */
+    @Override
+    public NetworkDetailsTracker createNetworkDetailsTracker(
+            Lifecycle lifecycle, Context context,
+            Handler mainHandler, Handler workerHandler, Clock clock,
+            long maxScanAgeMillis, long scanIntervalMillis,
+            String key) {
+        return NetworkDetailsTracker.createNetworkDetailsTracker(
+                lifecycle, context,
+                context.getSystemService(WifiManager.class),
+                context.getSystemService(ConnectivityManager.class),
+                context.getSystemService(NetworkScoreManager.class),
+                mainHandler, workerHandler, clock,
+                maxScanAgeMillis, scanIntervalMillis,
+                key);
+    }
+}
diff --git a/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java b/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java
index 3921488..46f4414 100644
--- a/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java
+++ b/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java
@@ -24,8 +24,6 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
-import android.net.ConnectivityManager;
-import android.net.NetworkScoreManager;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiConfiguration.KeyMgmt;
 import android.net.wifi.WifiManager;
@@ -60,6 +58,7 @@
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.core.InstrumentedFragment;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.wifitrackerlib.WifiEntry;
 import com.android.wifitrackerlib.WifiPickerTracker;
 
@@ -191,16 +190,15 @@
                 return SystemClock.elapsedRealtime();
             }
         };
-        mWifiPickerTracker = new WifiPickerTracker(getSettingsLifecycle(), mActivity,
-                mActivity.getSystemService(WifiManager.class),
-                mActivity.getSystemService(ConnectivityManager.class),
-                mActivity.getSystemService(NetworkScoreManager.class),
-                new Handler(Looper.getMainLooper()),
-                mWorkerThread.getThreadHandler(),
-                elapsedRealtimeClock,
-                MAX_SCAN_AGE_MILLIS,
-                SCAN_INTERVAL_MILLIS,
-                this);
+        mWifiPickerTracker = FeatureFactory.getFactory(mActivity.getApplicationContext())
+                .getWifiTrackerLibProvider()
+                .createWifiPickerTracker(getSettingsLifecycle(), mActivity,
+                        new Handler(Looper.getMainLooper()),
+                        mWorkerThread.getThreadHandler(),
+                        elapsedRealtimeClock,
+                        MAX_SCAN_AGE_MILLIS,
+                        SCAN_INTERVAL_MILLIS,
+                        this);
         return inflater.inflate(R.layout.wifi_add_app_networks, container, false);
     }
 
diff --git a/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java b/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java
index d0708ea..b154a9b 100644
--- a/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java
+++ b/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java
@@ -22,7 +22,6 @@
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.net.ConnectivityManager;
-import android.net.NetworkScoreManager;
 import android.net.wifi.WifiManager;
 import android.os.Handler;
 import android.os.HandlerThread;
@@ -42,6 +41,7 @@
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.wifi.WifiConfigUiBase2;
 import com.android.settings.wifi.WifiDialog2;
 import com.android.settingslib.RestrictedLockUtils;
@@ -239,18 +239,17 @@
             }
         };
 
-        mNetworkDetailsTracker = NetworkDetailsTracker.createNetworkDetailsTracker(
-                getSettingsLifecycle(),
-                context,
-                context.getSystemService(WifiManager.class),
-                context.getSystemService(ConnectivityManager.class),
-                context.getSystemService(NetworkScoreManager.class),
-                new Handler(Looper.getMainLooper()),
-                mWorkerThread.getThreadHandler(),
-                elapsedRealtimeClock,
-                MAX_SCAN_AGE_MILLIS,
-                SCAN_INTERVAL_MILLIS,
-                getArguments().getString(KEY_CHOSEN_WIFIENTRY_KEY));
+        mNetworkDetailsTracker = FeatureFactory.getFactory(context)
+                .getWifiTrackerLibProvider()
+                .createNetworkDetailsTracker(
+                        getSettingsLifecycle(),
+                        context,
+                        new Handler(Looper.getMainLooper()),
+                        mWorkerThread.getThreadHandler(),
+                        elapsedRealtimeClock,
+                        MAX_SCAN_AGE_MILLIS,
+                        SCAN_INTERVAL_MILLIS,
+                        getArguments().getString(KEY_CHOSEN_WIFIENTRY_KEY));
     }
 
     /**
diff --git a/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java b/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
index cee3ccd..5c80024 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
@@ -25,8 +25,6 @@
 import android.graphics.Matrix;
 import android.graphics.Rect;
 import android.graphics.SurfaceTexture;
-import android.net.ConnectivityManager;
-import android.net.NetworkScoreManager;
 import android.net.wifi.EasyConnectStatusCallback;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
@@ -57,6 +55,7 @@
 import androidx.lifecycle.ViewModelProviders;
 
 import com.android.settings.R;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.wifi.qrcode.QrCamera;
 import com.android.settings.wifi.qrcode.QrDecorateView;
 import com.android.wifitrackerlib.WifiEntry;
@@ -363,16 +362,15 @@
             }
         };
         final Context context = getContext();
-        mWifiPickerTracker = new WifiPickerTracker(getSettingsLifecycle(), context,
-                context.getSystemService(WifiManager.class),
-                context.getSystemService(ConnectivityManager.class),
-                context.getSystemService(NetworkScoreManager.class),
-                new Handler(Looper.getMainLooper()),
-                mWorkerThread.getThreadHandler(),
-                elapsedRealtimeClock,
-                MAX_SCAN_AGE_MILLIS,
-                SCAN_INTERVAL_MILLIS,
-                null /* listener */);
+        mWifiPickerTracker = FeatureFactory.getFactory(context)
+                .getWifiTrackerLibProvider()
+                .createWifiPickerTracker(getSettingsLifecycle(), context,
+                        new Handler(Looper.getMainLooper()),
+                        mWorkerThread.getThreadHandler(),
+                        elapsedRealtimeClock,
+                        MAX_SCAN_AGE_MILLIS,
+                        SCAN_INTERVAL_MILLIS,
+                        null /* listener */);
 
         // setTitle for TalkBack
         if (mIsConfiguratorMode) {
diff --git a/src/com/android/settings/wifi/slice/WifiScanWorker.java b/src/com/android/settings/wifi/slice/WifiScanWorker.java
index 6c0f4aa..78b0d33 100644
--- a/src/com/android/settings/wifi/slice/WifiScanWorker.java
+++ b/src/com/android/settings/wifi/slice/WifiScanWorker.java
@@ -19,8 +19,6 @@
 import static com.android.settings.wifi.slice.WifiSlice.DEFAULT_EXPANDED_ROW_COUNT;
 
 import android.content.Context;
-import android.net.ConnectivityManager;
-import android.net.NetworkScoreManager;
 import android.net.Uri;
 import android.net.wifi.WifiManager;
 import android.os.HandlerThread;
@@ -34,8 +32,10 @@
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.LifecycleRegistry;
 
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.slices.SliceBackgroundWorker;
 import com.android.settingslib.utils.ThreadUtils;
+import com.android.wifitrackerlib.MergedCarrierEntry;
 import com.android.wifitrackerlib.WifiEntry;
 import com.android.wifitrackerlib.WifiEntry.WifiEntryCallback;
 import com.android.wifitrackerlib.WifiPickerTracker;
@@ -78,16 +78,15 @@
                 return SystemClock.elapsedRealtime();
             }
         };
-        mWifiPickerTracker = new WifiPickerTracker(getLifecycle(), context,
-                context.getSystemService(WifiManager.class),
-                context.getSystemService(ConnectivityManager.class),
-                context.getSystemService(NetworkScoreManager.class),
-                ThreadUtils.getUiThreadHandler(),
-                mWorkerThread.getThreadHandler(),
-                elapsedRealtimeClock,
-                MAX_SCAN_AGE_MILLIS,
-                SCAN_INTERVAL_MILLIS,
-                this);
+        mWifiPickerTracker = FeatureFactory.getFactory(context)
+                .getWifiTrackerLibProvider()
+                .createWifiPickerTracker(getLifecycle(), context,
+                        ThreadUtils.getUiThreadHandler(),
+                        mWorkerThread.getThreadHandler(),
+                        elapsedRealtimeClock,
+                        MAX_SCAN_AGE_MILLIS,
+                        SCAN_INTERVAL_MILLIS,
+                        this);
 
         mLifecycleRegistry.markState(Lifecycle.State.INITIALIZED);
         mLifecycleRegistry.markState(Lifecycle.State.CREATED);
@@ -199,4 +198,18 @@
         }
         super.updateResults(resultList);
     }
+
+    public void setCarrierNetworkEnabled(boolean enable) {
+        final MergedCarrierEntry mergedCarrierEntry = mWifiPickerTracker.getMergedCarrierEntry();
+        if (mergedCarrierEntry != null) {
+            mergedCarrierEntry.setEnabled(enable);
+        }
+    }
+
+    public void connectCarrierNetwork() {
+        final MergedCarrierEntry mergedCarrierEntry = mWifiPickerTracker.getMergedCarrierEntry();
+        if (mergedCarrierEntry != null && mergedCarrierEntry.canConnect()) {
+            mergedCarrierEntry.connect(null /* ConnectCallback */);
+        }
+    }
 }
diff --git a/src/com/android/settings/wifi/slice/WifiSlice.java b/src/com/android/settings/wifi/slice/WifiSlice.java
index 56d87c3..898de56 100644
--- a/src/com/android/settings/wifi/slice/WifiSlice.java
+++ b/src/com/android/settings/wifi/slice/WifiSlice.java
@@ -183,7 +183,7 @@
 
     private IconCompat getEndIcon(WifiSliceItem wifiSliceItem) {
         if (wifiSliceItem.getConnectedState() != WifiEntry.CONNECTED_STATE_DISCONNECTED) {
-            return null;
+            return IconCompat.createWithResource(mContext, R.drawable.ic_settings_24dp);
         }
 
         if (wifiSliceItem.getSecurity() != WifiEntry.SECURITY_NONE) {
diff --git a/tests/robotests/src/com/android/settings/accessibility/MagnificationCapabilitiesTest.java b/tests/robotests/src/com/android/settings/accessibility/MagnificationCapabilitiesTest.java
new file mode 100644
index 0000000..ac7f073
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/MagnificationCapabilitiesTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2020 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.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+/** Tests for {@link MagnificationCapabilities} */
+@RunWith(RobolectricTestRunner.class)
+public final class MagnificationCapabilitiesTest {
+
+    private final Context mContext = ApplicationProvider.getApplicationContext();
+
+    @Test
+    public void getCapabilities_windowMode_expectedCapabilities() {
+        MagnificationCapabilities.setCapabilities(mContext,
+                MagnificationCapabilities.MagnificationMode.WINDOW);
+
+        final int windowCapabilities = MagnificationCapabilities.getCapabilities(mContext);
+        assertThat(windowCapabilities).isEqualTo(
+                MagnificationCapabilities.MagnificationMode.WINDOW);
+
+    }
+
+    @Test
+    public void getSummary_fullScreenMode_expectedSummary() {
+        final int fullScreenCapabilities = MagnificationCapabilities.MagnificationMode.FULLSCREEN;
+
+        final String actualString = MagnificationCapabilities.getSummary(mContext,
+                fullScreenCapabilities);
+
+        final String expectedString = mContext.getString(
+                R.string.accessibility_magnification_area_settings_full_screen_summary);
+        assertThat(actualString).isEqualTo(expectedString);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/MagnificationSettingsFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/MagnificationSettingsFragmentTest.java
new file mode 100644
index 0000000..d49213c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/MagnificationSettingsFragmentTest.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 2021 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.accessibility;
+
+import static com.android.settings.accessibility.MagnificationPreferenceFragment.ON;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.view.View;
+
+import androidx.fragment.app.FragmentManager;
+import androidx.preference.PreferenceManager;
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+import com.android.settings.testutils.shadow.ShadowDashboardFragment;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+/** Tests for {@link MagnificationSettingsFragment} */
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = ShadowDashboardFragment.class)
+public class MagnificationSettingsFragmentTest {
+
+    @Rule
+    public MockitoRule mocks = MockitoJUnit.rule();
+
+    @Mock
+    private PreferenceManager mPreferenceManager;
+
+    private static final String EXTRA_CAPABILITY =
+            MagnificationSettingsFragment.EXTRA_CAPABILITY;
+
+    private final Context mContext = ApplicationProvider.getApplicationContext();
+    private TestMagnificationSettingsFragment mFragment;
+
+    @Before
+    public void setUpFragment() {
+        mFragment = spy(new TestMagnificationSettingsFragment());
+        when(mFragment.getPreferenceManager()).thenReturn(mPreferenceManager);
+        when(mFragment.getPreferenceManager().getContext()).thenReturn(mContext);
+        doReturn(mock(FragmentManager.class, Answers.RETURNS_DEEP_STUBS)).when(
+                mFragment).getChildFragmentManager();
+        mContext.setTheme(R.style.Theme_AppCompat);
+    }
+
+    @Test
+    public void onCreateDialog_capabilitiesInBundle_matchCheckBoxStatus() {
+        final Bundle windowModeSavedInstanceState = new Bundle();
+        windowModeSavedInstanceState.putInt(EXTRA_CAPABILITY,
+                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW);
+
+        mFragment.onCreate(windowModeSavedInstanceState);
+        mFragment.onCreateDialog(MagnificationSettingsFragment.DIALOG_MAGNIFICATION_CAPABILITY);
+
+        assertThat(mFragment.mMagnifyFullScreenCheckBox.isChecked()).isFalse();
+        assertThat(mFragment.mMagnifyWindowCheckBox.isChecked()).isTrue();
+    }
+
+    @Test
+    public void onCreateDialog_capabilitiesInSettings_matchCheckBoxStatus() {
+        MagnificationCapabilities.setCapabilities(mContext,
+                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN);
+        mFragment.onCreate(Bundle.EMPTY);
+        mFragment.onCreateDialog(MagnificationSettingsFragment.DIALOG_MAGNIFICATION_CAPABILITY);
+
+        assertThat(mFragment.mMagnifyFullScreenCheckBox.isChecked()).isTrue();
+        assertThat(mFragment.mMagnifyWindowCheckBox.isChecked()).isFalse();
+    }
+
+    @Test
+    public void onCreateDialog_capabilitiesInSettingsAndBundle_matchBundleValueCheckBoxStatus() {
+        final Bundle allModeSavedInstanceState = new Bundle();
+        allModeSavedInstanceState.putInt(EXTRA_CAPABILITY,
+                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_ALL);
+
+        MagnificationCapabilities.setCapabilities(mContext,
+                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW);
+        mFragment.onCreate(allModeSavedInstanceState);
+        mFragment.onCreateDialog(MagnificationSettingsFragment.DIALOG_MAGNIFICATION_CAPABILITY);
+
+        assertThat(mFragment.mMagnifyFullScreenCheckBox.isChecked()).isTrue();
+        assertThat(mFragment.mMagnifyWindowCheckBox.isChecked()).isTrue();
+    }
+
+    @Test
+    public void onCreateDialog_emptySettingsAndBundle_matchDefaultValueCheckBoxStatus() {
+        mFragment.onCreate(Bundle.EMPTY);
+        mFragment.onCreateDialog(MagnificationSettingsFragment.DIALOG_MAGNIFICATION_CAPABILITY);
+
+        // Compare to default Capabilities
+        assertThat(mFragment.mMagnifyFullScreenCheckBox.isChecked()).isTrue();
+        assertThat(mFragment.mMagnifyWindowCheckBox.isChecked()).isFalse();
+    }
+
+    @Test
+    public void checkWindowModeCheckBox_tripleTapEnabled_showSwitchShortcutDialog() {
+        final Bundle fullScreenModeSavedInstanceState = new Bundle();
+        fullScreenModeSavedInstanceState.putInt(EXTRA_CAPABILITY,
+                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN);
+        mFragment.onCreate(fullScreenModeSavedInstanceState);
+        mFragment.onCreateDialog(MagnificationSettingsFragment.DIALOG_MAGNIFICATION_CAPABILITY);
+
+        enableTripleTap();
+        final View dialogWidowView = mFragment.mDialog.findViewById(R.id.magnify_window_screen);
+        final View dialogWindowTextArea = dialogWidowView.findViewById(R.id.container);
+        dialogWindowTextArea.performClick();
+
+        verify(mFragment).showDialog(
+                MagnificationSettingsFragment.DIALOG_MAGNIFICATION_SWITCH_SHORTCUT);
+    }
+
+    private void enableTripleTap() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, ON);
+    }
+
+    public static class TestMagnificationSettingsFragment extends MagnificationSettingsFragment {
+        public TestMagnificationSettingsFragment() {}
+
+        @Override
+        protected void showDialog(int dialogId) {
+            super.showDialog(dialogId);
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/RingVibrationIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/RingVibrationIntensityPreferenceControllerTest.java
new file mode 100644
index 0000000..0eaf008
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/RingVibrationIntensityPreferenceControllerTest.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2021 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.accessibility;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+import android.content.Context;
+import android.os.Vibrator;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+
+/** Tests for {@link RingVibrationIntensityPreferenceController}. */
+@RunWith(RobolectricTestRunner.class)
+public class RingVibrationIntensityPreferenceControllerTest {
+    @Mock
+    private Vibrator mVibrator;
+
+    private RingVibrationIntensityPreferenceController mController;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+
+        final Context mContext = spy(ApplicationProvider.getApplicationContext());
+        doReturn(mVibrator).when(mContext).getSystemService(Vibrator.class);
+        mController = new RingVibrationIntensityPreferenceController(mContext);
+    }
+
+    @Test
+    public void getAvailabilityStatus_available() {
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void getDefaultIntensity_success() {
+        doReturn(/* toBeReturned= */ 5).when(mVibrator).getDefaultRingVibrationIntensity();
+
+        assertThat(mController.getDefaultIntensity()).isEqualTo(/* expected= */ 5);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/TextAndDisplayFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/TextAndDisplayFragmentTest.java
new file mode 100644
index 0000000..96756ecd
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/TextAndDisplayFragmentTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2021 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.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+import com.android.settings.testutils.XmlTestUtils;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+public class TextAndDisplayFragmentTest {
+
+    private Context mContext = ApplicationProvider.getApplicationContext();
+
+    @Test
+    public void getNonIndexableKeys_existInXmlLayout() {
+        final List<String> niks = TextAndDisplayFragment.SEARCH_INDEX_DATA_PROVIDER
+                .getNonIndexableKeys(mContext);
+        final List<String> keys =
+                XmlTestUtils.getKeysFromPreferenceXml(mContext,
+                        R.xml.accessibility_text_and_display);
+
+        assertThat(keys).containsAtLeastElementsIn(niks);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleAutoclickPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleAutoclickPreferenceControllerTest.java
new file mode 100644
index 0000000..edc2992
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleAutoclickPreferenceControllerTest.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright (C) 2020 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.accessibility;
+
+import static android.content.Context.MODE_PRIVATE;
+
+import static com.android.settings.accessibility.ToggleAutoclickPreferenceController.AUTOCLICK_CUSTOM_MODE;
+import static com.android.settings.accessibility.ToggleAutoclickPreferenceController.AUTOCLICK_OFF_MODE;
+import static com.android.settings.accessibility.ToggleAutoclickPreferenceController.KEY_AUTOCLICK_CUSTOM_SEEKBAR;
+import static com.android.settings.accessibility.ToggleAutoclickPreferenceController.KEY_DELAY_MODE;
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.provider.Settings.Secure;
+
+import androidx.lifecycle.LifecycleObserver;
+import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.accessibility.ToggleAutoclickPreferenceController.OnChangeListener;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.LayoutPreference;
+import com.android.settingslib.widget.RadioButtonPreference;
+import com.android.settingslib.widget.RadioButtonPreference.OnClickListener;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+
+import java.util.Map;
+
+/** Tests for {@link ToggleAutoclickPreferenceController}. */
+@RunWith(RobolectricTestRunner.class)
+public class ToggleAutoclickPreferenceControllerTest {
+
+    @Mock
+    private PreferenceScreen mScreen;
+
+    @Mock
+    private RadioButtonPreference mDelayModePref;
+
+    @Mock
+    private OnChangeListener mOnChangeListener;
+
+    @Mock
+    private LayoutPreference mSeekBarPref;
+
+    @Mock
+    private Map<String, Integer> mAccessibilityAutoclickKeyToValueMap;
+
+    private ToggleAutoclickPreferenceController mController;
+    private SharedPreferences mSharedPreferences;
+    private final String mPrefKey = "prefKey";
+    private final Context mContext = ApplicationProvider.getApplicationContext();
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mController = new ToggleAutoclickPreferenceController(mContext, mPrefKey);
+        mController.mAccessibilityAutoclickKeyToValueMap = mAccessibilityAutoclickKeyToValueMap;
+        mSharedPreferences =
+                mContext.getSharedPreferences(mContext.getPackageName(), MODE_PRIVATE);
+
+        when(mScreen.findPreference(mPrefKey)).thenReturn(mDelayModePref);
+        when(mScreen.findPreference(KEY_AUTOCLICK_CUSTOM_SEEKBAR)).thenReturn(mSeekBarPref);
+        when(mAccessibilityAutoclickKeyToValueMap.get(mDelayModePref.getKey())).thenReturn(
+                AUTOCLICK_OFF_MODE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_available() {
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void setClickListenerOnDelayModePref_whenDisplay_success() {
+        mController.displayPreference(mScreen);
+
+        verify(mDelayModePref).setOnClickListener(any(OnClickListener.class));
+    }
+
+    @Test
+    public void constructor_hasLifecycle_addObserver() {
+        final Lifecycle lifecycle = mock(Lifecycle.class);
+        mController = new ToggleAutoclickPreferenceController(mContext, lifecycle, mPrefKey);
+
+        verify(lifecycle).addObserver(any(LifecycleObserver.class));
+    }
+
+    @Test
+    public void onRadioButtonClicked_offMode_disableAutoClick() {
+        when(mAccessibilityAutoclickKeyToValueMap.get(mPrefKey)).thenReturn(AUTOCLICK_OFF_MODE);
+
+        mController.displayPreference(mScreen);
+        mController.onRadioButtonClicked(any(RadioButtonPreference.class));
+        final boolean isEnabled = Secure.getInt(mContext.getContentResolver(),
+                Secure.ACCESSIBILITY_AUTOCLICK_ENABLED, /* def= */ 0) == 1;
+        final int delayMs = Secure.getInt(mContext.getContentResolver(),
+                Secure.ACCESSIBILITY_AUTOCLICK_DELAY, /* def= */ 0);
+        final int keyDelayMode = mSharedPreferences.getInt(KEY_DELAY_MODE, AUTOCLICK_CUSTOM_MODE);
+
+        assertThat(keyDelayMode).isEqualTo(AUTOCLICK_OFF_MODE);
+        assertThat(delayMs).isEqualTo(/* expected= */ 0);
+        assertThat(isEnabled).isFalse();
+    }
+
+    @Test
+    public void onRadioButtonClicked_customMode_enableAutoClick() {
+        when(mAccessibilityAutoclickKeyToValueMap.get(mDelayModePref.getKey())).thenReturn(
+                AUTOCLICK_CUSTOM_MODE);
+        when(mAccessibilityAutoclickKeyToValueMap.get(mPrefKey)).thenReturn(AUTOCLICK_CUSTOM_MODE);
+
+        mController.displayPreference(mScreen);
+        mController.onRadioButtonClicked(any(RadioButtonPreference.class));
+        final boolean isEnabled = Secure.getInt(mContext.getContentResolver(),
+                Secure.ACCESSIBILITY_AUTOCLICK_ENABLED, /* def= */ 0) == 1;
+        final int keyDelayMode = mSharedPreferences.getInt(KEY_DELAY_MODE, AUTOCLICK_CUSTOM_MODE);
+
+        assertThat(keyDelayMode).isEqualTo(AUTOCLICK_CUSTOM_MODE);
+        assertThat(isEnabled).isTrue();
+    }
+
+    @Test
+    public void onRadioButtonClicked_hasListener_runOnCheckedChanged() {
+        when(mAccessibilityAutoclickKeyToValueMap.get(mDelayModePref.getKey())).thenReturn(
+                AUTOCLICK_CUSTOM_MODE);
+        when(mAccessibilityAutoclickKeyToValueMap.get(mPrefKey)).thenReturn(AUTOCLICK_CUSTOM_MODE);
+
+        mController.setOnChangeListener(mOnChangeListener);
+        mController.displayPreference(mScreen);
+        mController.onRadioButtonClicked(any(RadioButtonPreference.class));
+
+        verify(mOnChangeListener).onCheckedChanged(mDelayModePref);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/VideoPlayerTest.java b/tests/robotests/src/com/android/settings/accessibility/VideoPlayerTest.java
new file mode 100644
index 0000000..57df456
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/VideoPlayerTest.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2020 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.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.media.MediaPlayer;
+import android.view.Surface;
+import android.view.TextureView;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.accessibility.VideoPlayer.State;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+
+/** Tests for {@link VideoPlayer}. */
+@RunWith(RobolectricTestRunner.class)
+public class VideoPlayerTest {
+
+    @Mock
+    private MediaPlayer mMediaPlayer;
+
+    @Mock
+    private TextureView mTextureView;
+
+    @Mock
+    private Surface mSurface;
+
+    private VideoPlayer mVideoPlayer;
+
+    @Before
+    public void initVideoPlayer() {
+        MockitoAnnotations.initMocks(this);
+
+        final int videoRes = 0;
+        final Context context = ApplicationProvider.getApplicationContext();
+
+        mVideoPlayer = spy(VideoPlayer.create(context, videoRes, mTextureView));
+        mVideoPlayer.mMediaPlayer = mMediaPlayer;
+        mVideoPlayer.mAnimationSurface = mSurface;
+    }
+
+    @Test
+    public void setSurfaceTextureListener_success() {
+        verify(mTextureView).setSurfaceTextureListener(any());
+    }
+
+    @Test
+    public void onPlayerPaused_startedState_pause() {
+        mVideoPlayer.mMediaPlayerState = State.STARTED;
+
+        mVideoPlayer.pause();
+
+        assertThat(mVideoPlayer.mMediaPlayerState).isEqualTo(State.PAUSED);
+        verify(mMediaPlayer).pause();
+    }
+
+    @Test
+    public void onPlayerResumed_pausedState_start() {
+        mVideoPlayer.mMediaPlayerState = State.PAUSED;
+
+        mVideoPlayer.resume();
+
+        assertThat(mVideoPlayer.mMediaPlayerState).isEqualTo(State.STARTED);
+        verify(mMediaPlayer).start();
+    }
+
+    @Test
+    public void onPlayerReleased_stoppedState_release() {
+        mVideoPlayer.mMediaPlayerState = State.STOPPED;
+
+        mVideoPlayer.release();
+
+        assertThat(mVideoPlayer.mMediaPlayerState).isEqualTo(State.END);
+        verify(mMediaPlayer).release();
+        verify(mSurface).release();
+    }
+
+    @Test
+    public void onSurfaceTextureDestroyed_preparedState_release() {
+        mVideoPlayer.mMediaPlayerState = State.PREPARED;
+
+        mVideoPlayer.onSurfaceTextureDestroyed(any());
+
+        assertThat(mVideoPlayer.mMediaPlayerState).isEqualTo(State.END);
+        verify(mMediaPlayer).release();
+        verify(mSurface).release();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java
index 7a4c610..74c0bb5 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java
@@ -25,7 +25,6 @@
 import static org.robolectric.Shadows.shadowOf;
 
 import android.app.Activity;
-import android.app.role.RoleControllerManager;
 import android.app.role.RoleManager;
 import android.content.Context;
 import android.content.Intent;
@@ -63,8 +62,6 @@
     @Mock
     private RoleManager mRoleManager;
     @Mock
-    private RoleControllerManager mRoleControllerManager;
-    @Mock
     private Preference mPreference;
 
     private Activity mActivity;
@@ -77,7 +74,6 @@
         MockitoAnnotations.initMocks(this);
         ShadowApplication shadowApplication = ShadowApplication.getInstance();
         shadowApplication.setSystemService(Context.ROLE_SERVICE, mRoleManager);
-        shadowApplication.setSystemService(Context.ROLE_CONTROLLER_SERVICE, mRoleControllerManager);
         mActivity = Robolectric.setupActivity(Activity.class);
         mShadowUserManager = shadowOf(mActivity.getSystemService(UserManager.class));
         mController = new TestRolePreferenceController(mActivity);
@@ -86,7 +82,7 @@
 
     @Test
     public void constructor_callsIsApplicationVisibleForRole() {
-        verify(mRoleControllerManager).isApplicationVisibleForRole(eq(TEST_ROLE_NAME), eq(
+        verify(mRoleManager).isApplicationVisibleForRole(eq(TEST_ROLE_NAME), eq(
                 TEST_PACKAGE_NAME), any(Executor.class), any(Consumer.class));
     }
 
@@ -153,7 +149,7 @@
     private void setRoleIsVisible(boolean visible) {
         final ArgumentCaptor<Consumer<Boolean>> callbackCaptor = ArgumentCaptor.forClass(
                 Consumer.class);
-        verify(mRoleControllerManager).isRoleVisible(eq(TEST_ROLE_NAME), any(Executor.class),
+        verify(mRoleManager).isRoleVisible(eq(TEST_ROLE_NAME), any(Executor.class),
                 callbackCaptor.capture());
         final Consumer<Boolean> callback = callbackCaptor.getValue();
         callback.accept(visible);
@@ -162,7 +158,7 @@
     private void setApplicationIsVisibleForRole(boolean visible) {
         final ArgumentCaptor<Consumer<Boolean>> callbackCaptor = ArgumentCaptor.forClass(
                 Consumer.class);
-        verify(mRoleControllerManager).isApplicationVisibleForRole(eq(TEST_ROLE_NAME), eq(
+        verify(mRoleManager).isApplicationVisibleForRole(eq(TEST_ROLE_NAME), eq(
                 TEST_PACKAGE_NAME), any(Executor.class), callbackCaptor.capture());
         final Consumer<Boolean> callback = callbackCaptor.getValue();
         callback.accept(visible);
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java
index 5940d72..6d4186c 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java
@@ -18,7 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import android.app.role.RoleControllerManager;
+import android.app.role.RoleManager;
 import android.content.Context;
 
 import org.junit.Before;
@@ -34,15 +34,14 @@
 public class DefaultBrowserShortcutPreferenceControllerTest {
 
     @Mock
-    private RoleControllerManager mRoleControllerManager;
+    private RoleManager mRoleManager;
 
     private DefaultBrowserShortcutPreferenceController mController;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        ShadowApplication.getInstance().setSystemService(Context.ROLE_CONTROLLER_SERVICE,
-                mRoleControllerManager);
+        ShadowApplication.getInstance().setSystemService(Context.ROLE_SERVICE, mRoleManager);
         mController = new DefaultBrowserShortcutPreferenceController(RuntimeEnvironment.application,
                 "Package1");
     }
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java
index 8dcf530..0acd7bd 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java
@@ -18,7 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import android.app.role.RoleControllerManager;
+import android.app.role.RoleManager;
 import android.content.Context;
 
 import org.junit.Before;
@@ -34,15 +34,14 @@
 public class DefaultEmergencyShortcutPreferenceControllerTest {
 
     @Mock
-    private RoleControllerManager mRoleControllerManager;
+    private RoleManager mRoleManager;
 
     private DefaultEmergencyShortcutPreferenceController mController;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        ShadowApplication.getInstance().setSystemService(Context.ROLE_CONTROLLER_SERVICE,
-                mRoleControllerManager);
+        ShadowApplication.getInstance().setSystemService(Context.ROLE_SERVICE, mRoleManager);
         mController = new DefaultEmergencyShortcutPreferenceController(
                 RuntimeEnvironment.application, "Package1");
     }
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java
index 7071fec..1f0023a 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java
@@ -18,7 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import android.app.role.RoleControllerManager;
+import android.app.role.RoleManager;
 import android.content.Context;
 
 import org.junit.Before;
@@ -34,15 +34,14 @@
 public class DefaultHomeShortcutPreferenceControllerTest {
 
     @Mock
-    private RoleControllerManager mRoleControllerManager;
+    private RoleManager mRoleManager;
 
     private DefaultHomeShortcutPreferenceController mController;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        ShadowApplication.getInstance().setSystemService(Context.ROLE_CONTROLLER_SERVICE,
-                mRoleControllerManager);
+        ShadowApplication.getInstance().setSystemService(Context.ROLE_SERVICE, mRoleManager);
         mController = new DefaultHomeShortcutPreferenceController(RuntimeEnvironment.application,
                 "Package1");
     }
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java
index d1b6aeb..c130665 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java
@@ -18,7 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import android.app.role.RoleControllerManager;
+import android.app.role.RoleManager;
 import android.content.Context;
 
 import org.junit.Before;
@@ -37,15 +37,14 @@
     private static final String PREFERENCE_KEY = "default_phone_app";
 
     @Mock
-    private RoleControllerManager mRoleControllerManager;
+    private RoleManager mRoleManager;
 
     private DefaultPhoneShortcutPreferenceController mController;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        ShadowApplication.getInstance().setSystemService(Context.ROLE_CONTROLLER_SERVICE,
-                mRoleControllerManager);
+        ShadowApplication.getInstance().setSystemService(Context.ROLE_SERVICE, mRoleManager);
         mController = new DefaultPhoneShortcutPreferenceController(RuntimeEnvironment.application,
                 TEST_PACKAGE_NAME);
     }
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java
index 691ce5e..e9c238d 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java
@@ -18,7 +18,6 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import android.app.role.RoleControllerManager;
 import android.app.role.RoleManager;
 import android.content.Context;
 
@@ -39,8 +38,6 @@
 
     @Mock
     private RoleManager mRoleManager;
-    @Mock
-    private RoleControllerManager mRoleControllerManager;
 
     private DefaultSmsShortcutPreferenceController mController;
 
@@ -49,7 +46,6 @@
         MockitoAnnotations.initMocks(this);
         final ShadowApplication shadowApplication = ShadowApplication.getInstance();
         shadowApplication.setSystemService(Context.ROLE_SERVICE, mRoleManager);
-        shadowApplication.setSystemService(Context.ROLE_CONTROLLER_SERVICE, mRoleControllerManager);
         mController = new DefaultSmsShortcutPreferenceController(RuntimeEnvironment.application,
                 TEST_PACKAGE_NAME);
     }
diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetailsTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetailsTest.java
deleted file mode 100644
index 26a78d0..0000000
--- a/tests/robotests/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetailsTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2019 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.specialaccess.notificationaccess;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class NotificationAccessDetailsTest {
-
-    private Context mContext;
-    private FakeFeatureFactory mFeatureFactory;
-    private NotificationAccessDetails mFragment;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mFeatureFactory = FakeFeatureFactory.setupForTest();
-        mFragment = spy(new NotificationAccessDetails());
-        mContext = RuntimeEnvironment.application;
-        doReturn(mContext).when(mFragment).getContext();
-
-    }
-
-    @Test
-    public void logSpecialPermissionChange() {
-        mFragment.logSpecialPermissionChange(true, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(
-                mContext,
-                MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_NOTIVIEW_ALLOW,
-                "app");
-
-        mFragment.logSpecialPermissionChange(false, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(
-                mContext,
-                MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_NOTIVIEW_DENY,
-                "app");
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
index 47edb40..41a5598 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
@@ -20,6 +20,7 @@
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.verify;
 
 import android.content.Intent;
@@ -95,7 +96,8 @@
                 any(byte[].class),
                 any(CancellationSignal.class),
                 anyInt(),
-                callbackCaptor.capture());
+                callbackCaptor.capture(),
+                eq(true));
 
         return callbackCaptor.getValue();
     }
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
index 465e735..f2ced9c 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
@@ -21,6 +21,7 @@
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.robolectric.RuntimeEnvironment.application;
 
@@ -30,7 +31,6 @@
 import android.hardware.fingerprint.FingerprintManager;
 import android.hardware.fingerprint.FingerprintManager.EnrollmentCallback;
 import android.os.CancellationSignal;
-import android.widget.Button;
 
 import com.android.settings.R;
 import com.android.settings.biometrics.BiometricEnrollBase;
@@ -152,7 +152,8 @@
                 any(byte[].class),
                 any(CancellationSignal.class),
                 anyInt(),
-                callbackCaptor.capture());
+                callbackCaptor.capture(),
+                eq(false));
 
         return callbackCaptor.getValue();
     }
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java
index ea5511d..d3a1fc1 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java
@@ -24,12 +24,18 @@
 import android.app.Activity;
 import android.app.KeyguardManager;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.hardware.biometrics.SensorProperties;
+import android.hardware.fingerprint.FingerprintSensorProperties;
+import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
 import android.view.View;
 import android.widget.Button;
 
 import com.android.settings.R;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.ShadowFingerprintManager;
 import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
+import com.android.settings.testutils.shadow.ShadowStorageManager;
 import com.android.settings.testutils.shadow.ShadowUserManager;
 
 import com.google.android.setupcompat.PartnerCustomizationLayout;
@@ -46,18 +52,39 @@
 import org.robolectric.shadows.ShadowActivity;
 import org.robolectric.shadows.ShadowKeyguardManager;
 
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = {ShadowLockPatternUtils.class, ShadowUserManager.class})
-public class FingerprintSuggestionActivityTest {
+import java.util.ArrayList;
 
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {
+        ShadowFingerprintManager.class,
+        ShadowLockPatternUtils.class,
+        ShadowStorageManager.class,
+        ShadowUserManager.class
+})
+public class FingerprintSuggestionActivityTest {
+    private FingerprintSuggestionActivity mActivity;
     private ActivityController<FingerprintSuggestionActivity> mController;
 
     @Before
     public void setUp() {
+        Shadows.shadowOf(application.getPackageManager())
+                .setSystemFeature(PackageManager.FEATURE_FINGERPRINT, true);
+
+        final FingerprintSensorPropertiesInternal prop = new FingerprintSensorPropertiesInternal(
+                0 /* sensorId */,
+                SensorProperties.STRENGTH_STRONG,
+                5 /* maxEnrollmentsPerUser */,
+                FingerprintSensorProperties.TYPE_REAR,
+                true /* resetLockoutRequiresHardwareAuthToken */);
+        final ArrayList<FingerprintSensorPropertiesInternal> props = new ArrayList<>();
+        props.add(prop);
+        ShadowFingerprintManager.setSensorProperties(props);
+
         FakeFeatureFactory.setupForTest();
 
         final Intent intent = new Intent();
         mController = Robolectric.buildActivity(FingerprintSuggestionActivity.class, intent);
+        mActivity = mController.get();
     }
 
     @Test
@@ -66,8 +93,7 @@
 
         mController.create().resume();
 
-        PartnerCustomizationLayout layout =
-                mController.get().findViewById(R.id.setup_wizard_layout);
+        PartnerCustomizationLayout layout = mActivity.findViewById(R.id.setup_wizard_layout);
         final Button cancelButton =
                 layout.getMixin(FooterBarMixin.class).getSecondaryButtonView();
         assertThat(cancelButton.getText().toString()).isEqualTo("Cancel");
@@ -75,8 +101,8 @@
                 .isEqualTo(View.VISIBLE);
         cancelButton.performClick();
 
-        ShadowActivity shadowActivity = Shadows.shadowOf(mController.get());
-        assertWithMessage("Is finishing").that(mController.get().isFinishing()).isTrue();
+        ShadowActivity shadowActivity = Shadows.shadowOf(mActivity);
+        assertWithMessage("Is finishing").that(mActivity.isFinishing()).isTrue();
         assertWithMessage("Result code").that(shadowActivity.getResultCode())
             .isEqualTo(Activity.RESULT_CANCELED);
     }
diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayPreferenceControllerTest.java
index eeaae67f..ea1896e 100644
--- a/tests/robotests/src/com/android/settings/display/NightDisplayPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/NightDisplayPreferenceControllerTest.java
@@ -2,11 +2,15 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import android.app.Application;
+import android.content.Context;
 import android.hardware.display.ColorDisplayManager;
+
 import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
+
 import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
@@ -17,41 +21,81 @@
 @Config(shadows = {SettingsShadowResources.class})
 public class NightDisplayPreferenceControllerTest {
 
-  @After
-  public void tearDown() {
-    SettingsShadowResources.reset();
-  }
+    private Context mContext;
+    private ColorDisplayManager mColorDisplayManager;
+    private NightDisplayPreferenceController mPreferenceController;
 
-  @Test
-  public void nightDisplaySuggestion_isNotCompleted_ifAutoModeDisabled() {
-    final Application context = RuntimeEnvironment.application;
-    context.getSystemService(ColorDisplayManager.class)
-        .setNightDisplayAutoMode(ColorDisplayManager.AUTO_MODE_DISABLED);
-    assertThat(NightDisplayPreferenceController.isSuggestionComplete(context)).isFalse();
-  }
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mColorDisplayManager = mContext.getSystemService(ColorDisplayManager.class);
+        mPreferenceController = new NightDisplayPreferenceController(mContext, "test");
+    }
 
-  @Test
-  public void nightDisplaySuggestion_isCompleted_ifAutoModeCustom() {
-    final Application context = RuntimeEnvironment.application;
-    context.getSystemService(ColorDisplayManager.class)
-        .setNightDisplayAutoMode(ColorDisplayManager.AUTO_MODE_CUSTOM_TIME);
-    assertThat(NightDisplayPreferenceController.isSuggestionComplete(context)).isTrue();
-  }
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
 
-  @Test
-  public void nightDisplaySuggestion_isCompleted_ifAutoModeTwilight() {
-    final Application context = RuntimeEnvironment.application;
-    context.getSystemService(ColorDisplayManager.class)
-        .setNightDisplayAutoMode(ColorDisplayManager.AUTO_MODE_TWILIGHT);
-    assertThat(NightDisplayPreferenceController.isSuggestionComplete(context)).isTrue();
-  }
+    @Test
+    public void nightDisplaySuggestion_isNotCompleted_ifAutoModeDisabled() {
+        mColorDisplayManager.setNightDisplayAutoMode(ColorDisplayManager.AUTO_MODE_DISABLED);
 
-  @Test
-  public void nightDisplaySuggestion_isCompleted_ifSuggestionDisabled() {
-    final Application context = RuntimeEnvironment.application;
-    context.getSystemService(ColorDisplayManager.class)
-        .setNightDisplayAutoMode(ColorDisplayManager.AUTO_MODE_DISABLED);
-    SettingsShadowResources.overrideResource(R.bool.config_night_light_suggestion_enabled, false);
-    assertThat(NightDisplayPreferenceController.isSuggestionComplete(context)).isTrue();
-  }
-}
+        assertThat(NightDisplayPreferenceController.isSuggestionComplete(mContext)).isFalse();
+    }
+
+    @Test
+    public void nightDisplaySuggestion_isCompleted_ifAutoModeCustom() {
+        mColorDisplayManager.setNightDisplayAutoMode(ColorDisplayManager.AUTO_MODE_CUSTOM_TIME);
+
+        assertThat(NightDisplayPreferenceController.isSuggestionComplete(mContext)).isTrue();
+    }
+
+    @Test
+    public void nightDisplaySuggestion_isCompleted_ifAutoModeTwilight() {
+        mColorDisplayManager.setNightDisplayAutoMode(ColorDisplayManager.AUTO_MODE_TWILIGHT);
+
+        assertThat(NightDisplayPreferenceController.isSuggestionComplete(mContext)).isTrue();
+    }
+
+    @Test
+    public void nightDisplaySuggestion_isCompleted_ifSuggestionDisabled() {
+        mColorDisplayManager.setNightDisplayAutoMode(ColorDisplayManager.AUTO_MODE_DISABLED);
+        SettingsShadowResources.overrideResource(R.bool.config_night_light_suggestion_enabled,
+                false);
+
+        assertThat(NightDisplayPreferenceController.isSuggestionComplete(mContext)).isTrue();
+    }
+
+    @Test
+    public void getAvailabilityStatus_nightDisplayIsSupported_returnAvailable() {
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.bool.config_nightDisplayAvailable, true);
+
+        assertThat(mPreferenceController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_nightDisplayIsNotSupported_returnUnsupportedOnDevice() {
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.bool.config_nightDisplayAvailable, false);
+
+        assertThat(mPreferenceController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    public void isChecked_nightDisplayIsActivated_returnTrue() {
+        mColorDisplayManager.setNightDisplayActivated(true);
+
+        assertThat(mPreferenceController.isChecked()).isTrue();
+    }
+
+    @Test
+    public void isChecked_nightDisplayIsNotActivated_returnFalse() {
+        mColorDisplayManager.setNightDisplayActivated(false);
+
+        assertThat(mPreferenceController.isChecked()).isFalse();
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/display/TopLevelWallpaperPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/TopLevelWallpaperPreferenceControllerTest.java
new file mode 100644
index 0000000..7b3ae65
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/TopLevelWallpaperPreferenceControllerTest.java
@@ -0,0 +1,205 @@
+/*
+ * Copyright (C) 2020 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 static org.mockito.Mockito.mock;
+
+import android.content.ComponentName;
+import android.content.Intent;
+import android.content.pm.ResolveInfo;
+
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+
+import com.google.common.collect.Lists;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.Shadows;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowPackageManager;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {SettingsShadowResources.class})
+public class TopLevelWallpaperPreferenceControllerTest {
+    private static final String TEST_KEY = "test_key";
+
+    private Intent mWallpaperIntent;
+    private Intent mStylesAndWallpaperIntent;
+    private FragmentActivity mContext;
+    private ShadowPackageManager mShadowPackageManager;
+
+    private TopLevelWallpaperPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = Robolectric.buildActivity(FragmentActivity.class).get();
+        SettingsShadowResources.overrideResource(
+                R.string.config_wallpaper_picker_package, "bogus.package.for.testing");
+        SettingsShadowResources.overrideResource(
+                R.string.config_styles_and_wallpaper_picker_class, "bogus.package.class");
+        mWallpaperIntent = new Intent().setComponent(new ComponentName(
+                mContext.getString(R.string.config_wallpaper_picker_package),
+                mContext.getString(R.string.config_wallpaper_picker_class)));
+        mStylesAndWallpaperIntent = new Intent().setComponent(new ComponentName(
+                mContext.getString(R.string.config_wallpaper_picker_package),
+                mContext.getString(R.string.config_styles_and_wallpaper_picker_class)));
+        mShadowPackageManager = Shadows.shadowOf(mContext.getPackageManager());
+        mController = new TopLevelWallpaperPreferenceController(mContext, TEST_KEY);
+    }
+
+    @Test
+    public void isAvailable_wallpaperPickerEnabledAndStylePickerEnabled_returnsTrue() {
+        mShadowPackageManager.setResolveInfosForIntent(
+                mWallpaperIntent, Lists.newArrayList(mock(ResolveInfo.class)));
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent, Lists.newArrayList(mock(ResolveInfo.class)));
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_wallpaperPickerEnabledAndStylePickerDisabled_returnsTrue() {
+        mShadowPackageManager.setResolveInfosForIntent(
+                mWallpaperIntent, Lists.newArrayList(mock(ResolveInfo.class)));
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent, Lists.newArrayList());
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_wallpaperPickerDisabledAndStylePickerEnabled_returnsTrue() {
+        mShadowPackageManager.setResolveInfosForIntent(
+                mWallpaperIntent, Lists.newArrayList());
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent, Lists.newArrayList(mock(ResolveInfo.class)));
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_wallpaperPickerDisabledAndStylePickerDisabled_returnsFalse() {
+        mShadowPackageManager.setResolveInfosForIntent(
+                mWallpaperIntent, Lists.newArrayList());
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent, Lists.newArrayList());
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void getComponentClassString_stylesAvailable_returnsStylePickerClassString() {
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent,
+                Lists.newArrayList(mock(ResolveInfo.class)));
+        assertThat(mController.getComponentClassString())
+                .isEqualTo(mContext.getString(R.string.config_styles_and_wallpaper_picker_class));
+    }
+
+    @Test
+    public void getComponentClassString_stylesUnavailable_returnsWallpaperPickerClassString() {
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent, Lists.newArrayList());
+        assertThat(mController.getComponentClassString())
+                .isEqualTo(mContext.getString(R.string.config_wallpaper_picker_class));
+    }
+
+    @Test
+    public void areStylesAvailable_noComponentSpecified() {
+        SettingsShadowResources.overrideResource(
+                R.string.config_styles_and_wallpaper_picker_class, "");
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent, Lists.newArrayList());
+
+        assertThat(mController.areStylesAvailable()).isFalse();
+    }
+
+    @Test
+    public void areStylesAvailable_componentUnresolveable() {
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent, Lists.newArrayList());
+
+        assertThat(mController.areStylesAvailable()).isFalse();
+    }
+
+    @Test
+    public void areStylesAvailable_componentResolved() {
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent,
+                Lists.newArrayList(mock(ResolveInfo.class)));
+
+        assertThat(mController.areStylesAvailable()).isTrue();
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_wallpaperOnly() {
+        mShadowPackageManager.setResolveInfosForIntent(
+                mWallpaperIntent, Lists.newArrayList(mock(ResolveInfo.class)));
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent, Lists.newArrayList());
+        Preference preference = new Preference(mContext);
+        preference.setKey(TEST_KEY);
+
+        mController.handlePreferenceTreeClick(preference);
+
+        assertThat(Shadows.shadowOf(mContext)
+                .getNextStartedActivityForResult().intent.getComponent().getClassName())
+                .isEqualTo(mContext.getString(R.string.config_wallpaper_picker_class));
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_stylesAndWallpaper() {
+        mShadowPackageManager.setResolveInfosForIntent(
+                mWallpaperIntent, Lists.newArrayList());
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent, Lists.newArrayList(mock(ResolveInfo.class)));
+        Preference preference = new Preference(mContext);
+        preference.setKey(TEST_KEY);
+
+        mController.handlePreferenceTreeClick(preference);
+
+        assertThat(Shadows.shadowOf(mContext)
+                .getNextStartedActivityForResult().intent.getComponent().getClassName())
+                .isEqualTo(mContext.getString(R.string.config_styles_and_wallpaper_picker_class));
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_launchSourceExtra() {
+        mShadowPackageManager.setResolveInfosForIntent(
+                mWallpaperIntent, Lists.newArrayList());
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent, Lists.newArrayList());
+        Preference preference = new Preference(mContext);
+        preference.setKey(TEST_KEY);
+
+        mController.handlePreferenceTreeClick(preference);
+
+        assertThat(Shadows.shadowOf(mContext).getNextStartedActivityForResult()
+                .intent.hasExtra("com.android.wallpaper.LAUNCH_SOURCE")).isTrue();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java
index 18155d8..6d2298b 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java
@@ -18,7 +18,6 @@
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
 import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
-import static com.android.settings.fuelgauge.TopLevelBatteryPreferenceController.getDashboardLabel;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -69,14 +68,16 @@
     public void getDashboardLabel_returnsCorrectLabel() {
         BatteryInfo info = new BatteryInfo();
         info.batteryPercentString = "3%";
-        assertThat(getDashboardLabel(mContext, info)).isEqualTo(info.batteryPercentString);
+        assertThat(mController.getDashboardLabel(mContext, info, true))
+                .isEqualTo(info.batteryPercentString);
 
         info.remainingLabel = "Phone will shut down soon";
-        assertThat(getDashboardLabel(mContext, info)).isEqualTo("3% - Phone will shut down soon");
+        assertThat(mController.getDashboardLabel(mContext, info, true))
+                .isEqualTo("3% - Phone will shut down soon");
 
         info.discharging = false;
         info.chargeLabel = "5% - charging";
-        assertThat(getDashboardLabel(mContext, info)).isEqualTo("5% - charging");
+        assertThat(mController.getDashboardLabel(mContext, info, true)).isEqualTo("5% - charging");
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java b/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
index db12580..4c7b4b5 100644
--- a/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
@@ -48,25 +48,36 @@
 
 @RunWith(RobolectricTestRunner.class)
 public class SettingsHomepageActivityTest {
+
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
     }
 
     @Test
-    public void setHomepageContainerPaddingTop_shouldBeSetPaddingTop() {
+    public void setDefaultHomepageContainerPaddingTop_shouldSetSearchBoxHeight() {
         final SettingsHomepageActivity activity = Robolectric.buildActivity(
                 SettingsHomepageActivity.class).create().get();
-        final int searchBarHeight = activity.getResources().getDimensionPixelSize(
-                R.dimen.search_bar_height);
-        final int searchBarMargin = activity.getResources().getDimensionPixelSize(
-                R.dimen.search_bar_margin);
         final View view = activity.findViewById(R.id.homepage_container);
 
-        activity.setHomepageContainerPaddingTop();
+        activity.setDefaultHomepageContainerPaddingTop();
 
         final int actualPaddingTop = view.getPaddingTop();
-        assertThat(actualPaddingTop).isEqualTo(searchBarHeight + searchBarMargin * 2);
+        assertThat(actualPaddingTop).isEqualTo(activity.getSearchBoxHeight());
+    }
+
+    @Test
+    public void setHomepageContainerTopOffset_shouldBeSetPaddingTop() {
+        final SettingsHomepageActivity activity = Robolectric.buildActivity(
+                SettingsHomepageActivity.class).create().get();
+        final View view = activity.findViewById(R.id.homepage_container);
+        final int offset = activity.getResources().getDimensionPixelSize(
+                R.dimen.suggestion_height);
+
+        activity.setHomepageContainerTopOffset(offset);
+
+        final int actualPaddingTop = view.getPaddingTop();
+        assertThat(actualPaddingTop).isEqualTo(activity.getSearchBoxHeight() + offset);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionManagerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionManagerTest.java
index 2157908..06cd726 100644
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionManagerTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionManagerTest.java
@@ -67,13 +67,6 @@
     }
 
     @Test
-    public void getDisplayableCards_hasDisplayable() {
-        when(mController.isDisplayable()).thenReturn(true);
-
-        assertThat(mManager.getDisplayableCards()).hasSize(1);
-    }
-
-    @Test
     public void onPrimaryClick_shouldRelayToController() {
         mManager.onPrimaryClick(mContext, ID);
 
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelperTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelperTest.java
index 395748b..f5df4fa 100644
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelperTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelperTest.java
@@ -48,8 +48,6 @@
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 
-import java.util.Collections;
-
 @RunWith(RobolectricTestRunner.class)
 public class SliceFullCardRendererHelperTest {
 
@@ -138,7 +136,7 @@
                 mActivity,
                 title.hashCode() /* requestCode */,
                 new Intent("test action"),
-                0  /* flags */);
+                PendingIntent.FLAG_IMMUTABLE);
         final SliceAction action
                 = SliceAction.createDeeplink(pendingIntent, icon, ListBuilder.SMALL_IMAGE, title);
         return new ListBuilder(mActivity, TEST_SLICE_URI, ListBuilder.INFINITY)
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceHalfCardRendererHelperTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceHalfCardRendererHelperTest.java
index 1286c27..a7112d2 100644
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceHalfCardRendererHelperTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceHalfCardRendererHelperTest.java
@@ -106,7 +106,7 @@
                 mActivity,
                 title.hashCode() /* requestCode */,
                 new Intent("test action"),
-                0  /* flags */);
+                PendingIntent.FLAG_IMMUTABLE);
         final SliceAction action
                 = SliceAction.createDeeplink(pendingIntent, icon, ListBuilder.SMALL_IMAGE, title);
         return new ListBuilder(mActivity, TEST_SLICE_URI, ListBuilder.INFINITY)
diff --git a/tests/robotests/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java
deleted file mode 100644
index 57b2e2f..0000000
--- a/tests/robotests/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java
+++ /dev/null
@@ -1,553 +0,0 @@
-/*
- * Copyright (C) 2018 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.network;
-
-import static android.telephony.SignalStrength.NUM_SIGNAL_STRENGTH_BINS;
-import static android.telephony.SignalStrength.SIGNAL_STRENGTH_GOOD;
-import static android.telephony.SignalStrength.SIGNAL_STRENGTH_GREAT;
-import static android.telephony.SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN;
-import static android.telephony.SignalStrength.SIGNAL_STRENGTH_POOR;
-import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.drawable.Drawable;
-import android.net.ConnectivityManager;
-import android.net.Network;
-import android.net.NetworkCapabilities;
-import android.provider.Settings;
-import android.telephony.SignalStrength;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowSubscriptionManager;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowSubscriptionManager.class)
-public class SubscriptionsPreferenceControllerTest {
-    private static final String KEY = "preference_group";
-
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private PreferenceCategory mPreferenceCategory;
-    @Mock
-    private SubscriptionManager mSubscriptionManager;
-    @Mock
-    private ConnectivityManager mConnectivityManager;
-    @Mock
-    private TelephonyManager mTelephonyManager;
-    @Mock
-    private Network mActiveNetwork;
-    @Mock
-    private NetworkCapabilities mCapabilities;
-    @Mock
-    private Drawable mSignalStrengthIcon;
-
-    private Context mContext;
-    private LifecycleOwner mLifecycleOwner;
-    private Lifecycle mLifecycle;
-    private SubscriptionsPreferenceController mController;
-    private int mOnChildUpdatedCount;
-    private SubscriptionsPreferenceController.UpdateListener mUpdateListener;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-        mLifecycleOwner = () -> mLifecycle;
-        mLifecycle = new Lifecycle(mLifecycleOwner);
-        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
-        when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager);
-        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
-        when(mConnectivityManager.getActiveNetwork()).thenReturn(mActiveNetwork);
-        when(mConnectivityManager.getNetworkCapabilities(mActiveNetwork)).thenReturn(mCapabilities);
-        when(mTelephonyManager.createForSubscriptionId(anyInt())).thenReturn(mTelephonyManager);
-        when(mScreen.findPreference(eq(KEY))).thenReturn(mPreferenceCategory);
-        when(mPreferenceCategory.getContext()).thenReturn(mContext);
-        mOnChildUpdatedCount = 0;
-        mUpdateListener = () -> mOnChildUpdatedCount++;
-
-        mController = spy(
-                new SubscriptionsPreferenceController(mContext, mLifecycle, mUpdateListener,
-                        KEY, 5));
-        doReturn(true).when(mController).canSubscriptionBeDisplayed(any(), anyInt());
-        doReturn(mSignalStrengthIcon).when(mController).getIcon(anyInt(), anyInt(), anyBoolean());
-    }
-
-    @After
-    public void tearDown() {
-        SubscriptionUtil.setActiveSubscriptionsForTesting(null);
-    }
-
-    @Test
-    public void isAvailable_oneSubscription_availableFalse() {
-        setupMockSubscriptions(1);
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isAvailable_twoSubscriptions_availableTrue() {
-        setupMockSubscriptions(2);
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_fiveSubscriptions_availableTrue() {
-        setupMockSubscriptions(5);
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_airplaneModeOn_availableFalse() {
-        setupMockSubscriptions(2);
-        assertThat(mController.isAvailable()).isTrue();
-        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1);
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void onAirplaneModeChanged_airplaneModeTurnedOn_eventFired() {
-        setupMockSubscriptions(2);
-        mController.onResume();
-        mController.displayPreference(mScreen);
-        assertThat(mController.isAvailable()).isTrue();
-
-        final int updateCountBeforeModeChange = mOnChildUpdatedCount;
-        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1);
-        mController.onAirplaneModeChanged(true);
-        assertThat(mController.isAvailable()).isFalse();
-        assertThat(mOnChildUpdatedCount).isEqualTo(updateCountBeforeModeChange + 1);
-    }
-
-    @Test
-    public void onAirplaneModeChanged_airplaneModeTurnedOff_eventFired() {
-        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1);
-        setupMockSubscriptions(2);
-        mController.onResume();
-        mController.displayPreference(mScreen);
-        assertThat(mController.isAvailable()).isFalse();
-
-        final int updateCountBeforeModeChange = mOnChildUpdatedCount;
-        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 0);
-        mController.onAirplaneModeChanged(false);
-        assertThat(mController.isAvailable()).isTrue();
-        assertThat(mOnChildUpdatedCount).isEqualTo(updateCountBeforeModeChange + 1);
-    }
-
-    @Test
-    public void onSubscriptionsChanged_countBecameTwo_eventFired() {
-        final List<SubscriptionInfo> subs = setupMockSubscriptions(2);
-        SubscriptionUtil.setActiveSubscriptionsForTesting(subs.subList(0, 1));
-        mController.onResume();
-        mController.displayPreference(mScreen);
-        assertThat(mController.isAvailable()).isFalse();
-
-        final int updateCountBeforeSubscriptionChange = mOnChildUpdatedCount;
-        SubscriptionUtil.setActiveSubscriptionsForTesting(subs);
-        mController.onSubscriptionsChanged();
-        assertThat(mController.isAvailable()).isTrue();
-        assertThat(mOnChildUpdatedCount).isEqualTo(updateCountBeforeSubscriptionChange + 1);
-    }
-
-    @Test
-    public void onSubscriptionsChanged_countBecameOne_eventFiredAndPrefsRemoved() {
-        final List<SubscriptionInfo> subs = setupMockSubscriptions(2);
-        mController.onResume();
-        mController.displayPreference(mScreen);
-        assertThat(mController.isAvailable()).isTrue();
-        verify(mPreferenceCategory, times(2)).addPreference(any(Preference.class));
-
-        final int updateCountBeforeSubscriptionChange = mOnChildUpdatedCount;
-        SubscriptionUtil.setActiveSubscriptionsForTesting(subs.subList(0, 1));
-        mController.onSubscriptionsChanged();
-        assertThat(mController.isAvailable()).isFalse();
-        assertThat(mOnChildUpdatedCount).isEqualTo(updateCountBeforeSubscriptionChange + 1);
-
-        verify(mPreferenceCategory, times(2)).removePreference(any(Preference.class));
-    }
-
-    @Test
-    public void onSubscriptionsChanged_subscriptionReplaced_preferencesChanged() {
-        final List<SubscriptionInfo> subs = setupMockSubscriptions(3);
-
-        // Start out with only sub1 and sub2.
-        SubscriptionUtil.setActiveSubscriptionsForTesting(subs.subList(0, 2));
-        mController.onResume();
-        mController.displayPreference(mScreen);
-        final ArgumentCaptor<Preference> captor = ArgumentCaptor.forClass(Preference.class);
-        verify(mPreferenceCategory, times(2)).addPreference(captor.capture());
-        assertThat(captor.getAllValues().size()).isEqualTo(2);
-        assertThat(captor.getAllValues().get(0).getTitle()).isEqualTo("sub1");
-        assertThat(captor.getAllValues().get(1).getTitle()).isEqualTo("sub2");
-
-        // Now replace sub2 with sub3, and make sure the old preference was removed and the new
-        // preference was added.
-        final int updateCountBeforeSubscriptionChange = mOnChildUpdatedCount;
-        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(subs.get(0), subs.get(2)));
-        mController.onSubscriptionsChanged();
-        assertThat(mController.isAvailable()).isTrue();
-        assertThat(mOnChildUpdatedCount).isEqualTo(updateCountBeforeSubscriptionChange + 1);
-
-        verify(mPreferenceCategory).removePreference(captor.capture());
-        assertThat(captor.getValue().getTitle()).isEqualTo("sub2");
-        verify(mPreferenceCategory, times(3)).addPreference(captor.capture());
-        assertThat(captor.getValue().getTitle()).isEqualTo("sub3");
-    }
-
-
-    /**
-     * Helper to create a specified number of subscriptions, display them, and then click on one and
-     * verify that the intent fires and has the right subscription id extra.
-     *
-     * @param subscriptionCount the number of subscriptions
-     * @param selectedPrefIndex index of the subscription to click on
-     */
-    private void runPreferenceClickTest(final int subscriptionCount, final int selectedPrefIndex) {
-        final List<SubscriptionInfo> subs = setupMockSubscriptions(subscriptionCount);
-        final ArgumentCaptor<Preference> prefCaptor = ArgumentCaptor.forClass(Preference.class);
-        mController.displayPreference(mScreen);
-        verify(mPreferenceCategory, times(subscriptionCount)).addPreference(prefCaptor.capture());
-        final List<Preference> prefs = prefCaptor.getAllValues();
-        final Preference pref = prefs.get(selectedPrefIndex);
-        final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
-        doNothing().when(mContext).startActivity(intentCaptor.capture());
-        pref.getOnPreferenceClickListener().onPreferenceClick(pref);
-        final Intent intent = intentCaptor.getValue();
-        assertThat(intent).isNotNull();
-        assertThat(intent.hasExtra(Settings.EXTRA_SUB_ID)).isTrue();
-        final int subIdFromIntent = intent.getIntExtra(Settings.EXTRA_SUB_ID,
-                INVALID_SUBSCRIPTION_ID);
-        assertThat(subIdFromIntent).isEqualTo(
-                subs.get(selectedPrefIndex).getSubscriptionId());
-    }
-
-    @Test
-    public void twoPreferences_firstPreferenceClicked_correctIntentFires() {
-        runPreferenceClickTest(2, 0);
-    }
-
-    @Test
-    public void twoPreferences_secondPreferenceClicked_correctIntentFires() {
-        runPreferenceClickTest(2, 1);
-    }
-
-    @Test
-    public void threePreferences_secondPreferenceClicked_correctIntentFires() {
-        runPreferenceClickTest(3, 1);
-    }
-
-    @Test
-    public void threePreferences_thirdPreferenceClicked_correctIntentFires() {
-        runPreferenceClickTest(3, 2);
-    }
-
-    @Test
-    public void getSummary_twoSubsOneDefaultForEverythingDataActive() {
-        setupMockSubscriptions(2);
-
-        ShadowSubscriptionManager.setDefaultSmsSubscriptionId(11);
-        ShadowSubscriptionManager.setDefaultVoiceSubscriptionId(11);
-        when(mTelephonyManager.isDataEnabled()).thenReturn(true);
-        when(mCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)).thenReturn(true);
-
-        assertThat(mController.getSummary(11, true)).isEqualTo(
-                mContext.getString(R.string.default_for_calls_and_sms) + System.lineSeparator()
-                        + mContext.getString(R.string.mobile_data_active));
-
-        assertThat(mController.getSummary(22, false)).isEqualTo(
-                mContext.getString(R.string.subscription_available));
-    }
-
-    @Test
-    public void getSummary_twoSubsOneDefaultForEverythingDataNotActive() {
-        setupMockSubscriptions(2, 1, true);
-
-        ShadowSubscriptionManager.setDefaultSmsSubscriptionId(1);
-        ShadowSubscriptionManager.setDefaultVoiceSubscriptionId(1);
-
-        assertThat(mController.getSummary(1, true)).isEqualTo(
-                mContext.getString(R.string.default_for_calls_and_sms) + System.lineSeparator()
-                        + mContext.getString(R.string.default_for_mobile_data));
-
-        assertThat(mController.getSummary(2, false)).isEqualTo(
-                mContext.getString(R.string.subscription_available));
-    }
-
-    @Test
-    public void getSummary_twoSubsOneDefaultForEverythingDataDisabled() {
-        setupMockSubscriptions(2);
-
-        ShadowSubscriptionManager.setDefaultVoiceSubscriptionId(1);
-        ShadowSubscriptionManager.setDefaultSmsSubscriptionId(1);
-
-        assertThat(mController.getSummary(1, true)).isEqualTo(
-                mContext.getString(R.string.default_for_calls_and_sms) + System.lineSeparator()
-                        + mContext.getString(R.string.mobile_data_off));
-
-        assertThat(mController.getSummary(2, false)).isEqualTo(
-                mContext.getString(R.string.subscription_available));
-    }
-
-    @Test
-    public void getSummary_twoSubsOneForCallsAndDataOneForSms() {
-        setupMockSubscriptions(2, 1, true);
-
-        ShadowSubscriptionManager.setDefaultSmsSubscriptionId(2);
-        ShadowSubscriptionManager.setDefaultVoiceSubscriptionId(1);
-
-        assertThat(mController.getSummary(1, true)).isEqualTo(
-                mContext.getString(R.string.default_for_calls) + System.lineSeparator()
-                        + mContext.getString(R.string.default_for_mobile_data));
-
-        assertThat(mController.getSummary(2, false)).isEqualTo(
-                mContext.getString(R.string.default_for_sms));
-    }
-
-    @Test
-    public void setIcon_nullStrength_noCrash() {
-        final List<SubscriptionInfo> subs = setupMockSubscriptions(2);
-        setMockSubSignalStrength(subs, 0, -1);
-        final Preference pref = mock(Preference.class);
-
-        mController.setIcon(pref, 1, true /* isDefaultForData */);
-        verify(mController).getIcon(eq(0), eq(NUM_SIGNAL_STRENGTH_BINS), eq(true));
-    }
-
-    @Test
-    public void setIcon_noSignal_correctLevels() {
-        final List<SubscriptionInfo> subs = setupMockSubscriptions(2, 1, true);
-        setMockSubSignalStrength(subs, 0, SIGNAL_STRENGTH_NONE_OR_UNKNOWN);
-        setMockSubSignalStrength(subs, 1, SIGNAL_STRENGTH_NONE_OR_UNKNOWN);
-        setMockSubDataEnabled(subs, 0, true);
-        final Preference pref = mock(Preference.class);
-
-        mController.setIcon(pref, 1, true /* isDefaultForData */);
-        verify(mController).getIcon(eq(0), eq(NUM_SIGNAL_STRENGTH_BINS), eq(false));
-
-        mController.setIcon(pref, 2, false /* isDefaultForData */);
-        verify(mController).getIcon(eq(0), eq(NUM_SIGNAL_STRENGTH_BINS), eq(true));
-    }
-
-    @Test
-    public void setIcon_noSignal_withInflation_correctLevels() {
-        final List<SubscriptionInfo> subs = setupMockSubscriptions(2, 1, true);
-        setMockSubSignalStrength(subs, 0, SIGNAL_STRENGTH_NONE_OR_UNKNOWN);
-        setMockSubSignalStrength(subs, 1, SIGNAL_STRENGTH_NONE_OR_UNKNOWN);
-        final Preference pref = mock(Preference.class);
-        doReturn(true).when(mController).shouldInflateSignalStrength(anyInt());
-
-        mController.setIcon(pref, 1, true /* isDefaultForData */);
-        verify(mController).getIcon(eq(1), eq(NUM_SIGNAL_STRENGTH_BINS + 1), eq(false));
-
-        mController.setIcon(pref, 2, false /* isDefaultForData */);
-        verify(mController).getIcon(eq(1), eq(NUM_SIGNAL_STRENGTH_BINS + 1), eq(true));
-    }
-
-    @Test
-    public void setIcon_greatSignal_correctLevels() {
-        final List<SubscriptionInfo> subs = setupMockSubscriptions(2, 1, true);
-        setMockSubSignalStrength(subs, 0, SIGNAL_STRENGTH_GREAT);
-        setMockSubSignalStrength(subs, 1, SIGNAL_STRENGTH_GREAT);
-        final Preference pref = mock(Preference.class);
-
-        mController.setIcon(pref, 1, true /* isDefaultForData */);
-        verify(mController).getIcon(eq(4), eq(NUM_SIGNAL_STRENGTH_BINS), eq(false));
-
-        mController.setIcon(pref, 2, false /* isDefaultForData */);
-        verify(mController).getIcon(eq(4), eq(NUM_SIGNAL_STRENGTH_BINS), eq(true));
-    }
-
-    @Test
-    public void onSignalStrengthChanged_subTwoGoesFromGoodToGreat_correctLevels() {
-        final List<SubscriptionInfo> subs = setupMockSubscriptions(2);
-        setMockSubSignalStrength(subs, 0, SIGNAL_STRENGTH_POOR);
-        setMockSubSignalStrength(subs, 1, SIGNAL_STRENGTH_GOOD);
-
-        mController.onResume();
-        mController.displayPreference(mScreen);
-
-        // Now change the signal strength for the 2nd subscription from Good to Great
-        setMockSubSignalStrength(subs, 1, SIGNAL_STRENGTH_GREAT);
-        mController.onSignalStrengthChanged();
-
-        final ArgumentCaptor<Integer> level = ArgumentCaptor.forClass(Integer.class);
-        verify(mController, times(4)).getIcon(level.capture(), eq(NUM_SIGNAL_STRENGTH_BINS),
-                eq(true));
-        assertThat(level.getAllValues().get(0)).isEqualTo(1);
-        assertThat(level.getAllValues().get(1)).isEqualTo(3); // sub2, first time
-        assertThat(level.getAllValues().get(2)).isEqualTo(1);
-        assertThat(level.getAllValues().get(3)).isEqualTo(4); // sub2, after change
-    }
-
-    @Test
-    public void displayPreference_mobileDataOff_bothSubsHaveCutOut() {
-        setupMockSubscriptions(2, 1, false);
-
-        mController.onResume();
-        mController.displayPreference(mScreen);
-
-        verify(mController, times(2)).getIcon(eq(SIGNAL_STRENGTH_GOOD),
-                eq(NUM_SIGNAL_STRENGTH_BINS), eq(true));
-    }
-
-    @Test
-    public void displayPreference_mobileDataOn_onlyNonDefaultSubHasCutOut() {
-        final List<SubscriptionInfo> subs = setupMockSubscriptions(2, 1, true);
-        setMockSubSignalStrength(subs, 1, SIGNAL_STRENGTH_POOR);
-
-        mController.onResume();
-        mController.displayPreference(mScreen);
-
-        verify(mController).getIcon(eq(SIGNAL_STRENGTH_GOOD), eq(NUM_SIGNAL_STRENGTH_BINS),
-                eq(false));
-        verify(mController).getIcon(eq(SIGNAL_STRENGTH_POOR), eq(NUM_SIGNAL_STRENGTH_BINS),
-                eq(true));
-    }
-
-    @Test
-    public void displayPreference_subscriptionsWithSameGroupUUID_onlyOneWillBeSeen() {
-        doReturn(false).when(mController).canSubscriptionBeDisplayed(any(), eq(3));
-        final List<SubscriptionInfo> subs = setupMockSubscriptions(3);
-        SubscriptionUtil.setActiveSubscriptionsForTesting(subs.subList(0, 3));
-
-        mController.onResume();
-        mController.displayPreference(mScreen);
-
-        verify(mPreferenceCategory, times(2)).addPreference(any(Preference.class));
-    }
-
-    @Test
-    public void onMobileDataEnabledChange_mobileDataTurnedOff_bothSubsHaveCutOut() {
-        final List<SubscriptionInfo> subs = setupMockSubscriptions(2, 1, true);
-
-        mController.onResume();
-        mController.displayPreference(mScreen);
-
-        setMockSubDataEnabled(subs, 0, false);
-        mController.onMobileDataEnabledChange();
-
-        final ArgumentCaptor<Boolean> cutOutCaptor = ArgumentCaptor.forClass(Boolean.class);
-        verify(mController, times(4)).getIcon(eq(SIGNAL_STRENGTH_GOOD),
-                eq(NUM_SIGNAL_STRENGTH_BINS), cutOutCaptor.capture());
-        assertThat(cutOutCaptor.getAllValues().get(0)).isEqualTo(false); // sub1, first time
-        assertThat(cutOutCaptor.getAllValues().get(1)).isEqualTo(true);
-        assertThat(cutOutCaptor.getAllValues().get(2)).isEqualTo(true); // sub1, second time
-        assertThat(cutOutCaptor.getAllValues().get(3)).isEqualTo(true);
-    }
-
-    private List<SubscriptionInfo> setupMockSubscriptions(int count) {
-        return setupMockSubscriptions(count, 0, true);
-    }
-
-    /** Helper method to setup several mock active subscriptions. The generated subscription id's
-     * start at 1.
-     *
-     * @param count How many subscriptions to create
-     * @param defaultDataSubId The subscription id of the default data subscription - pass
-     *                         INVALID_SUBSCRIPTION_ID if there should not be one
-     * @param mobileDataEnabled Whether mobile data should be considered enabled for the default
-     *                          data subscription
-     */
-    private List<SubscriptionInfo> setupMockSubscriptions(int count, int defaultDataSubId,
-            boolean mobileDataEnabled) {
-        if (defaultDataSubId != INVALID_SUBSCRIPTION_ID) {
-            ShadowSubscriptionManager.setDefaultDataSubscriptionId(defaultDataSubId);
-        }
-        final ArrayList<SubscriptionInfo> infos = new ArrayList<>();
-        for (int i = 0; i < count; i++) {
-            final int subscriptionId = i + 1;
-            final SubscriptionInfo info = mock(SubscriptionInfo.class);
-            final TelephonyManager mgrForSub = mock(TelephonyManager.class);
-            final SignalStrength signalStrength = mock(SignalStrength.class);
-
-            if (subscriptionId == defaultDataSubId) {
-                when(mgrForSub.isDataEnabled()).thenReturn(mobileDataEnabled);
-            }
-            when(info.getSubscriptionId()).thenReturn(i + 1);
-            when(info.getDisplayName()).thenReturn("sub" + (i + 1));
-            doReturn(mgrForSub).when(mTelephonyManager).createForSubscriptionId(eq(subscriptionId));
-            when(mgrForSub.getSignalStrength()).thenReturn(signalStrength);
-            when(signalStrength.getLevel()).thenReturn(SIGNAL_STRENGTH_GOOD);
-
-            infos.add(info);
-        }
-        SubscriptionUtil.setActiveSubscriptionsForTesting(infos);
-        return infos;
-    }
-
-    /**
-     * Helper method to set the signal strength returned for a mock subscription
-     * @param subs The list of subscriptions
-     * @param index The index in of the subscription in |subs| to change
-     * @param level The signal strength level to return for the subscription. Pass -1 to force
-     *              return of a null SignalStrength object for the subscription.
-     */
-    private void setMockSubSignalStrength(List<SubscriptionInfo> subs, int index, int level) {
-        final TelephonyManager mgrForSub =
-                mTelephonyManager.createForSubscriptionId(subs.get(index).getSubscriptionId());
-        if (level == -1) {
-            when(mgrForSub.getSignalStrength()).thenReturn(null);
-        } else {
-            final SignalStrength signalStrength = mgrForSub.getSignalStrength();
-            when(signalStrength.getLevel()).thenReturn(level);
-        }
-    }
-
-    private void setMockSubDataEnabled(List<SubscriptionInfo> subs, int index, boolean enabled) {
-        final TelephonyManager mgrForSub =
-                mTelephonyManager.createForSubscriptionId(subs.get(index).getSubscriptionId());
-        when(mgrForSub.isDataEnabled()).thenReturn(enabled);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/notification/AssistantFeedbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AssistantFeedbackPreferenceControllerTest.java
index 8cfb0e0..9f172a6 100644
--- a/tests/robotests/src/com/android/settings/notification/AssistantFeedbackPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/AssistantFeedbackPreferenceControllerTest.java
@@ -28,12 +28,18 @@
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
+import android.provider.DeviceConfig;
 import android.provider.Settings;
 
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 import androidx.preference.TwoStatePreference;
 
+import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.testutils.shadow.ShadowDeviceConfig;
+
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -42,8 +48,10 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
+@Config(shadows = {ShadowDeviceConfig.class})
 public class AssistantFeedbackPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -65,14 +73,48 @@
         when(mScreen.findPreference(mPreference.getKey())).thenReturn(mPreference);
     }
 
+    @After
+    public void tearDown() {
+        ShadowDeviceConfig.reset();
+    }
+
     @Test
-    public void testIsVisible() {
+    public void testIsVisible_DeviceConfigOn() {
+        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_SYSTEMUI,
+                SystemUiDeviceConfigFlags.ENABLE_NAS_FEEDBACK, "true", true);
         mController.displayPreference(mScreen);
 
         assertThat(mPreference.isVisible()).isTrue();
     }
 
     @Test
+    public void testIsVisible_DeviceConfigOff() {
+        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_SYSTEMUI,
+                SystemUiDeviceConfigFlags.ENABLE_NAS_FEEDBACK, "false", true);
+        mController.displayPreference(mScreen);
+
+        assertThat(mPreference.isVisible()).isFalse();
+    }
+
+    @Test
+    public void getAvailabilityStatus_DeviceConfigOn_returnAvailable() {
+        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_SYSTEMUI,
+                SystemUiDeviceConfigFlags.ENABLE_NAS_FEEDBACK, "true", true);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_DeviceConfigOff_returnUnavailable() {
+        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_SYSTEMUI,
+                SystemUiDeviceConfigFlags.ENABLE_NAS_FEEDBACK, "false", true);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
     public void updateState_preferenceSetCheckedWhenSettingIsOn() {
         final TwoStatePreference preference = mock(TwoStatePreference.class);
         final Context context = RuntimeEnvironment.application;
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenCustomRadioButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenCustomRadioButtonPreferenceTest.java
deleted file mode 100644
index f6e51cd..0000000
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenCustomRadioButtonPreferenceTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2018 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.notification.zen;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.RadioButton;
-
-import androidx.preference.PreferenceViewHolder;
-
-import com.android.settings.R;
-import com.android.settings.notification.zen.ZenCustomRadioButtonPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class ZenCustomRadioButtonPreferenceTest {
-
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-    }
-
-    @Test
-    public void createNewPreference_shouldSetLayout() {
-        final ZenCustomRadioButtonPreference preference
-                = new ZenCustomRadioButtonPreference(mContext);
-
-        assertThat(preference.getLayoutResource()).isEqualTo(R.layout.preference_two_target_radio);
-        assertThat(preference.getWidgetLayoutResource())
-                .isEqualTo(R.layout.preference_widget_gear);
-    }
-
-    @Test
-    public void setChecked_shouldUpdateButtonCheckedState() {
-        final ZenCustomRadioButtonPreference preference =
-                new ZenCustomRadioButtonPreference(mContext);
-        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
-                LayoutInflater.from(mContext).inflate(
-                  R.layout.preference_two_target_radio, null));
-        final RadioButton toggle = (RadioButton) holder.findViewById(android.R.id.checkbox);
-        preference.onBindViewHolder(holder);
-
-        preference.setChecked(true);
-        assertThat(toggle.isChecked()).isTrue();
-
-        preference.setChecked(false);
-        assertThat(toggle.isChecked()).isFalse();
-    }
-
-    @Test
-    public void clickRadioButton_shouldNotifyRadioButtonClicked() {
-        final ZenCustomRadioButtonPreference preference
-                = new ZenCustomRadioButtonPreference(mContext);
-        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
-                LayoutInflater.from(mContext).inflate(R.layout.preference_two_target_radio, null));
-        final View toggle = holder.findViewById(R.id.checkbox_frame);
-
-        ZenCustomRadioButtonPreference.OnRadioButtonClickListener l = mock(
-                ZenCustomRadioButtonPreference.OnRadioButtonClickListener.class);
-        preference.setOnRadioButtonClickListener(l);
-        preference.onBindViewHolder(holder);
-
-        toggle.performClick();
-        verify(l).onRadioButtonClick(preference);
-    }
-
-    @Test
-    public void clickWidgetView_shouldNotifyWidgetClicked() {
-        final ZenCustomRadioButtonPreference preference =
-                new ZenCustomRadioButtonPreference(mContext);
-        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
-                LayoutInflater.from(mContext).inflate(R.layout.preference_two_target_radio, null));
-        final View widgetView = holder.findViewById(android.R.id.widget_frame);
-
-        ZenCustomRadioButtonPreference.OnGearClickListener l = mock(
-                ZenCustomRadioButtonPreference.OnGearClickListener.class);
-        preference.setOnGearClickListener(l);
-        preference.onBindViewHolder(holder);
-
-        widgetView.performClick();
-        verify(l).onGearClick(preference);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsAllPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsAllPreferenceControllerTest.java
index 05537f3..45a40d3 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsAllPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsAllPreferenceControllerTest.java
@@ -40,11 +40,9 @@
 
 import androidx.preference.PreferenceScreen;
 
-import com.android.settings.notification.zen.ZenCustomRadioButtonPreference;
-import com.android.settings.notification.zen.ZenModeBackend;
-import com.android.settings.notification.zen.ZenModeVisEffectsAllPreferenceController;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -63,7 +61,7 @@
     @Mock
     private ZenModeBackend mBackend;
     @Mock
-    private ZenCustomRadioButtonPreference mockPref;
+    private RadioButtonPreference mPref;
     private Context mContext;
     private FakeFeatureFactory mFeatureFactory;
     @Mock
@@ -86,7 +84,7 @@
                 mContext, mock(Lifecycle.class), PREF_KEY);
         ReflectionHelpers.setField(mController, "mBackend", mBackend);
 
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mockPref);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPref);
         mController.displayPreference(mScreen);
     }
 
@@ -98,9 +96,9 @@
     @Test
     public void updateState_notChecked() {
         mBackend.mPolicy = new NotificationManager.Policy(0, 0, 0, 1);
-        mController.updateState(mockPref);
+        mController.updateState(mPref);
 
-        verify(mockPref).setChecked(false);
+        verify(mPref).setChecked(false);
     }
 
     @Test
@@ -115,9 +113,9 @@
                 | SUPPRESSED_EFFECT_PEEK
                 | SUPPRESSED_EFFECT_NOTIFICATION_LIST;
         mBackend.mPolicy = new NotificationManager.Policy(0, 0, 0, allSuppressed);
-        mController.updateState(mockPref);
+        mController.updateState(mPref);
 
-        verify(mockPref).setChecked(true);
+        verify(mPref).setChecked(true);
     }
 
     @Test
@@ -132,7 +130,7 @@
                 | SUPPRESSED_EFFECT_PEEK
                 | SUPPRESSED_EFFECT_NOTIFICATION_LIST;
         mBackend.mPolicy = new NotificationManager.Policy(0, 0, 0, 1);
-        mController.onRadioButtonClick(mockPref);
+        mController.onRadioButtonClicked(mPref);
         verify(mBackend).saveVisualEffectsPolicy(allSuppressed, true);
         verify(mFeatureFactory.metricsFeatureProvider).action(eq(mContext),
                 eq(ACTION_ZEN_SOUND_AND_VIS_EFFECTS),
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceControllerTest.java
index baea9ef..88c2c50 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceControllerTest.java
@@ -38,11 +38,9 @@
 
 import androidx.preference.PreferenceScreen;
 
-import com.android.settings.notification.zen.ZenCustomRadioButtonPreference;
-import com.android.settings.notification.zen.ZenModeBackend;
-import com.android.settings.notification.zen.ZenModeVisEffectsCustomPreferenceController;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -61,7 +59,7 @@
     @Mock
     private ZenModeBackend mBackend;
     @Mock
-    private ZenCustomRadioButtonPreference mockPref;
+    private RadioButtonPreference mPref;
     private Context mContext;
     @Mock
     private PreferenceScreen mScreen;
@@ -83,7 +81,7 @@
                 mContext, mock(Lifecycle.class), PREF_KEY);
         ReflectionHelpers.setField(mController, "mBackend", mBackend);
 
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mockPref);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPref);
         mController.displayPreference(mScreen);
     }
 
@@ -102,9 +100,9 @@
     @Test
     public void updateState_notChecked_noVisEffects() {
         mBackend.mPolicy = new NotificationManager.Policy(0, 0, 0, 0);
-        mController.updateState(mockPref);
+        mController.updateState(mPref);
 
-        verify(mockPref).setChecked(false);
+        verify(mPref).setChecked(false);
     }
 
     @Test
@@ -119,25 +117,25 @@
                 | SUPPRESSED_EFFECT_PEEK
                 | SUPPRESSED_EFFECT_NOTIFICATION_LIST;
         mBackend.mPolicy = new NotificationManager.Policy(0, 0, 0, allSuppressed);
-        mController.updateState(mockPref);
+        mController.updateState(mPref);
 
-        verify(mockPref).setChecked(false);
+        verify(mPref).setChecked(false);
     }
 
     @Test
     public void updateState_checked() {
         mBackend.mPolicy = new NotificationManager.Policy(0, 0, 0, 2);
-        mController.updateState(mockPref);
+        mController.updateState(mPref);
 
-        verify(mockPref).setChecked(true);
+        verify(mPref).setChecked(true);
     }
 
     @Test
     public void updateState_listeners() {
         mBackend.mPolicy = new NotificationManager.Policy(0, 0, 0, 2);
-        mController.updateState(mockPref);
+        mController.updateState(mPref);
 
-        verify(mockPref).setOnGearClickListener(any());
-        verify(mockPref).setOnRadioButtonClickListener(any());
+        verify(mPref).setExtraWidgetOnClickListener(any());
+        verify(mPref).setOnClickListener(any());
     }
 }
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsNonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsNonePreferenceControllerTest.java
index aacb109..79c6cb8 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsNonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsNonePreferenceControllerTest.java
@@ -40,11 +40,9 @@
 
 import androidx.preference.PreferenceScreen;
 
-import com.android.settings.notification.zen.ZenCustomRadioButtonPreference;
-import com.android.settings.notification.zen.ZenModeBackend;
-import com.android.settings.notification.zen.ZenModeVisEffectsNonePreferenceController;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -63,7 +61,7 @@
     @Mock
     private ZenModeBackend mBackend;
     @Mock
-    private ZenCustomRadioButtonPreference mockPref;
+    private RadioButtonPreference mMockPref;
     private Context mContext;
     private FakeFeatureFactory mFeatureFactory;
     @Mock
@@ -86,7 +84,7 @@
                 mContext, mock(Lifecycle.class), PREF_KEY);
         ReflectionHelpers.setField(mController, "mBackend", mBackend);
 
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mockPref);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mMockPref);
         mController.displayPreference(mScreen);
     }
 
@@ -98,17 +96,17 @@
     @Test
     public void updateState_notChecked() {
         mBackend.mPolicy = new NotificationManager.Policy(0, 0, 0, 1);
-        mController.updateState(mockPref);
+        mController.updateState(mMockPref);
 
-        verify(mockPref).setChecked(false);
+        verify(mMockPref).setChecked(false);
     }
 
     @Test
     public void updateState_checked() {
         mBackend.mPolicy = new NotificationManager.Policy(0, 0, 0, 0);
-        mController.updateState(mockPref);
+        mController.updateState(mMockPref);
 
-        verify(mockPref).setChecked(true);
+        verify(mMockPref).setChecked(true);
     }
 
     @Test
@@ -123,7 +121,7 @@
                 | SUPPRESSED_EFFECT_PEEK
                 | SUPPRESSED_EFFECT_NOTIFICATION_LIST;
         mBackend.mPolicy = new NotificationManager.Policy(0, 0, 0, 1);
-        mController.onRadioButtonClick(mockPref);
+        mController.onRadioButtonClicked(mMockPref);
         verify(mBackend).saveVisualEffectsPolicy(allSuppressed, false);
         verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(ACTION_ZEN_SOUND_ONLY),
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleCustomPolicyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleCustomPolicyPreferenceControllerTest.java
index f6fa5b7..f149541 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleCustomPolicyPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleCustomPolicyPreferenceControllerTest.java
@@ -27,6 +27,7 @@
 import androidx.preference.PreferenceScreen;
 
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -47,7 +48,7 @@
     @Mock
     private NotificationManager mNotificationManager;
     @Mock
-    private ZenCustomRadioButtonPreference mockPref;
+    private RadioButtonPreference mMockPref;
     @Mock
     private PreferenceScreen mScreen;
 
@@ -70,21 +71,21 @@
                 PREF_KEY);
         ReflectionHelpers.setField(mController, "mBackend", mBackend);
         when(mBackend.getAutomaticZenRule(RULE_ID)).thenReturn(mRule);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mockPref);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mMockPref);
         mController.displayPreference(mScreen);
     }
 
     @Test
     public void updateState_nullZenPolicy() {
         updateControllerZenPolicy(null);
-        mController.updateState(mockPref);
-        verify(mockPref).setChecked(false);
+        mController.updateState(mMockPref);
+        verify(mMockPref).setChecked(false);
     }
 
     @Test
     public void updateState_hasZenPolicy() {
         updateControllerZenPolicy(new ZenPolicy.Builder().build());
-        mController.updateState(mockPref);
-        verify(mockPref).setChecked(true);
+        mController.updateState(mMockPref);
+        verify(mMockPref).setChecked(true);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleDefaultPolicyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleDefaultPolicyPreferenceControllerTest.java
index 7091ceb..c0258e4 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleDefaultPolicyPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleDefaultPolicyPreferenceControllerTest.java
@@ -27,6 +27,7 @@
 import androidx.preference.PreferenceScreen;
 
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -47,7 +48,7 @@
     @Mock
     private NotificationManager mNotificationManager;
     @Mock
-    private ZenCustomRadioButtonPreference mockPref;
+    private RadioButtonPreference mMockPref;
     @Mock
     private PreferenceScreen mScreen;
 
@@ -70,21 +71,21 @@
                 PREF_KEY);
         ReflectionHelpers.setField(mController, "mBackend", mBackend);
         when(mBackend.getAutomaticZenRule(RULE_ID)).thenReturn(mRule);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mockPref);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mMockPref);
         mController.displayPreference(mScreen);
     }
 
     @Test
     public void updateState_nullZenPolicy() {
         updateControllerZenPolicy(null);
-        mController.updateState(mockPref);
-        verify(mockPref).setChecked(true);
+        mController.updateState(mMockPref);
+        verify(mMockPref).setChecked(true);
     }
 
     @Test
     public void updateState_hasZenPolicy() {
         updateControllerZenPolicy(new ZenPolicy.Builder().build());
-        mController.updateState(mockPref);
-        verify(mockPref).setChecked(false);
+        mController.updateState(mMockPref);
+        verify(mMockPref).setChecked(false);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenRulePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRulePreferenceControllerTest.java
index 13963db..e3fef19 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenRulePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRulePreferenceControllerTest.java
@@ -28,10 +28,8 @@
 
 import androidx.preference.PreferenceScreen;
 
-import com.android.settings.notification.zen.AbstractZenCustomRulePreferenceController;
-import com.android.settings.notification.zen.ZenCustomRadioButtonPreference;
-import com.android.settings.notification.zen.ZenModeBackend;
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -51,7 +49,7 @@
     @Mock
     private NotificationManager mNotificationManager;
     @Mock
-    private ZenCustomRadioButtonPreference mockPref;
+    private RadioButtonPreference mMockPref;
     @Mock
     private PreferenceScreen mScreen;
 
@@ -67,7 +65,7 @@
         mContext = RuntimeEnvironment.application;
         mController = new TestablePreferenceController(mContext,"test", mock(Lifecycle.class));
         ReflectionHelpers.setField(mController, "mBackend", mBackend);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mockPref);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mMockPref);
         mController.displayPreference(mScreen);
     }
 
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsAllPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsAllPreferenceControllerTest.java
index f30587f..edbcd06 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsAllPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsAllPreferenceControllerTest.java
@@ -27,6 +27,7 @@
 import androidx.preference.PreferenceScreen;
 
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -47,7 +48,7 @@
     @Mock
     private NotificationManager mNotificationManager;
     @Mock
-    private ZenCustomRadioButtonPreference mockPref;
+    private RadioButtonPreference mMockPref;
     @Mock
     private PreferenceScreen mScreen;
 
@@ -69,7 +70,7 @@
                 PREF_KEY);
         ReflectionHelpers.setField(mController, "mBackend", mBackend);
         when(mBackend.getAutomaticZenRule(RULE_ID)).thenReturn(mRule);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mockPref);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mMockPref);
         mController.displayPreference(mScreen);
     }
 
@@ -78,8 +79,8 @@
         updateControllerZenPolicy(new ZenPolicy.Builder()
                 .hideAllVisualEffects()
                 .build());
-        mController.updateState(mockPref);
-        verify(mockPref).setChecked(false);
+        mController.updateState(mMockPref);
+        verify(mMockPref).setChecked(false);
     }
 
     @Test
@@ -87,8 +88,8 @@
         updateControllerZenPolicy(new ZenPolicy.Builder()
                 .showAllVisualEffects()
                 .build());
-        mController.updateState(mockPref);
-        verify(mockPref).setChecked(true);
+        mController.updateState(mMockPref);
+        verify(mMockPref).setChecked(true);
     }
 
     @Test
@@ -97,8 +98,8 @@
                 .showPeeking(true)
                 .showBadges(false)
                 .build());
-        mController.updateState(mockPref);
+        mController.updateState(mMockPref);
 
-        verify(mockPref).setChecked(false);
+        verify(mMockPref).setChecked(false);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsCustomPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsCustomPreferenceControllerTest.java
index 99b76ce..ece5d5f 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsCustomPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsCustomPreferenceControllerTest.java
@@ -27,6 +27,7 @@
 import androidx.preference.PreferenceScreen;
 
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -47,7 +48,7 @@
     @Mock
     private NotificationManager mNotificationManager;
     @Mock
-    private ZenCustomRadioButtonPreference mockPref;
+    private RadioButtonPreference mMockPref;
     @Mock
     private PreferenceScreen mScreen;
 
@@ -69,7 +70,7 @@
                 PREF_KEY);
         ReflectionHelpers.setField(mController, "mBackend", mBackend);
         when(mBackend.getAutomaticZenRule(RULE_ID)).thenReturn(mRule);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mockPref);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mMockPref);
         mController.displayPreference(mScreen);
     }
 
@@ -78,8 +79,8 @@
         updateControllerZenPolicy(new ZenPolicy.Builder()
                 .hideAllVisualEffects()
                 .build());
-        mController.updateState(mockPref);
-        verify(mockPref).setChecked(false);
+        mController.updateState(mMockPref);
+        verify(mMockPref).setChecked(false);
     }
 
     @Test
@@ -87,8 +88,8 @@
         updateControllerZenPolicy(new ZenPolicy.Builder()
                 .showAllVisualEffects()
                 .build());
-        mController.updateState(mockPref);
-        verify(mockPref).setChecked(false);
+        mController.updateState(mMockPref);
+        verify(mMockPref).setChecked(false);
     }
 
     @Test
@@ -97,8 +98,8 @@
                 .showPeeking(true)
                 .showBadges(false)
                 .build());
-        mController.updateState(mockPref);
+        mController.updateState(mMockPref);
 
-        verify(mockPref).setChecked(true);
+        verify(mMockPref).setChecked(true);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsNonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsNonePreferenceControllerTest.java
index 510da5f..2daf4fb 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsNonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsNonePreferenceControllerTest.java
@@ -27,6 +27,7 @@
 import androidx.preference.PreferenceScreen;
 
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -47,7 +48,7 @@
     @Mock
     private NotificationManager mNotificationManager;
     @Mock
-    private ZenCustomRadioButtonPreference mockPref;
+    private RadioButtonPreference mMockPref;
     @Mock
     private PreferenceScreen mScreen;
 
@@ -69,7 +70,7 @@
                 PREF_KEY);
         ReflectionHelpers.setField(mController, "mBackend", mBackend);
         when(mBackend.getAutomaticZenRule(RULE_ID)).thenReturn(mRule);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mockPref);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mMockPref);
         mController.displayPreference(mScreen);
     }
 
@@ -78,8 +79,8 @@
         updateControllerZenPolicy(new ZenPolicy.Builder()
                 .hideAllVisualEffects()
                 .build());
-        mController.updateState(mockPref);
-        verify(mockPref).setChecked(true);
+        mController.updateState(mMockPref);
+        verify(mMockPref).setChecked(true);
     }
 
     @Test
@@ -87,8 +88,8 @@
         updateControllerZenPolicy(new ZenPolicy.Builder()
                 .showAllVisualEffects()
                 .build());
-        mController.updateState(mockPref);
-        verify(mockPref).setChecked(false);
+        mController.updateState(mMockPref);
+        verify(mMockPref).setChecked(false);
     }
 
     @Test
@@ -97,8 +98,8 @@
                 .showPeeking(true)
                 .showBadges(false)
                 .build());
-        mController.updateState(mockPref);
+        mController.updateState(mMockPref);
 
-        verify(mockPref).setChecked(false);
+        verify(mMockPref).setChecked(false);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/security/RequestManageCredentialsTest.java b/tests/robotests/src/com/android/settings/security/RequestManageCredentialsTest.java
index ccc6a0b..aacbf0c 100644
--- a/tests/robotests/src/com/android/settings/security/RequestManageCredentialsTest.java
+++ b/tests/robotests/src/com/android/settings/security/RequestManageCredentialsTest.java
@@ -18,18 +18,24 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.robolectric.Shadows.shadowOf;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
 
-import android.app.Activity;
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
 import android.content.Intent;
 import android.net.Uri;
+import android.os.UserHandle;
 import android.security.AppUriAuthenticationPolicy;
 import android.security.Credentials;
+import android.security.IKeyChainService;
 import android.security.KeyChain;
 import android.widget.Button;
 import android.widget.LinearLayout;
 
-import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.settings.R;
@@ -37,10 +43,10 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.shadows.ShadowActivity;
 
 @RunWith(RobolectricTestRunner.class)
 public class RequestManageCredentialsTest {
@@ -52,7 +58,14 @@
 
     private RequestManageCredentials mActivity;
 
-    private ShadowActivity mShadowActivity;
+    @Mock
+    private DevicePolicyManager mDevicePolicyManager;
+
+    @Mock
+    private KeyChain.KeyChainConnection mKeyChainConnection;
+
+    @Mock
+    private IKeyChainService mKeyChainService;
 
     @Before
     public void setUp() {
@@ -60,21 +73,98 @@
     }
 
     @Test
-    public void onCreate_intentActionNotManageCredentials_finishActivity() {
-        final Intent intent = new Intent("android.security.ANOTHER_ACTION");
+    public void onCreate_intentActionNotManageCredentials_finishActivity()
+            throws Exception {
+        final Intent intent = new Intent(Credentials.ACTION_MANAGE_CREDENTIALS + "_bad");
+        intent.putExtra(KeyChain.EXTRA_AUTHENTICATION_POLICY, AUTHENTICATION_POLICY);
+        setupActivityWithAction(intent);
+        when(mDevicePolicyManager.getDeviceOwnerUser()).thenReturn(null);
+        when(mDevicePolicyManager.getProfileOwner()).thenReturn(null);
+        when(mActivity.getLaunchedFromPackage()).thenReturn("com.example.credapp");
 
-        initActivity(intent);
+        mActivity.onCreate(null);
 
         assertThat(mActivity).isNotNull();
         assertThat(mActivity.isFinishing()).isTrue();
     }
 
     @Test
-    public void onCreate_authenticationPolicyProvided_startActivity() {
+    public void onCreate_noAuthenticationPolicy_finishActivity()
+            throws Exception {
+        final Intent intent = new Intent(Credentials.ACTION_MANAGE_CREDENTIALS);
+        setupActivityWithAction(intent);
+        when(mDevicePolicyManager.getDeviceOwnerUser()).thenReturn(null);
+        when(mDevicePolicyManager.getProfileOwner()).thenReturn(null);
+        when(mActivity.getLaunchedFromPackage()).thenReturn("com.example.credapp");
+
+        mActivity.onCreate(null);
+
+        assertThat(mActivity).isNotNull();
+        assertThat(mActivity.isFinishing()).isTrue();
+    }
+
+    @Test
+    public void onCreate_invalidAuthenticationPolicy_finishActivity()
+            throws Exception {
+        final Intent intent = new Intent(Credentials.ACTION_MANAGE_CREDENTIALS);
+        intent.putExtra(KeyChain.EXTRA_AUTHENTICATION_POLICY, "Invalid policy");
+
+        setupActivityWithAction(intent);
+        when(mDevicePolicyManager.getDeviceOwnerUser()).thenReturn(null);
+        when(mDevicePolicyManager.getProfileOwner()).thenReturn(null);
+        when(mActivity.getLaunchedFromPackage()).thenReturn("com.example.credapp");
+
+        mActivity.onCreate(null);
+
+        assertThat(mActivity).isNotNull();
+        assertThat(mActivity.isFinishing()).isTrue();
+    }
+
+    @Test
+    public void onCreate_runOnManagedProfile_finishActivity()
+            throws Exception {
         final Intent intent = new Intent(Credentials.ACTION_MANAGE_CREDENTIALS);
         intent.putExtra(KeyChain.EXTRA_AUTHENTICATION_POLICY, AUTHENTICATION_POLICY);
 
-        initActivity(intent);
+        setupActivityWithAction(intent);
+        when(mDevicePolicyManager.getDeviceOwnerUser()).thenReturn(null);
+        when(mDevicePolicyManager.getProfileOwner()).thenReturn(new ComponentName("pkg", "cls"));
+        when(mActivity.getLaunchedFromPackage()).thenReturn("com.example.credapp");
+
+        mActivity.onCreate(null);
+
+        assertThat(mActivity).isNotNull();
+        assertThat(mActivity.isFinishing()).isTrue();
+    }
+
+    @Test
+    public void onCreate_runOnManagedDevice_finishActivity()
+            throws Exception {
+        final Intent intent = new Intent(Credentials.ACTION_MANAGE_CREDENTIALS);
+        intent.putExtra(KeyChain.EXTRA_AUTHENTICATION_POLICY, AUTHENTICATION_POLICY);
+
+        setupActivityWithAction(intent);
+        when(mDevicePolicyManager.getDeviceOwnerUser()).thenReturn(UserHandle.SYSTEM);
+        when(mDevicePolicyManager.getProfileOwner()).thenReturn(null);
+        when(mActivity.getLaunchedFromPackage()).thenReturn("com.example.credapp");
+
+        mActivity.onCreate(null);
+
+        assertThat(mActivity).isNotNull();
+        assertThat(mActivity.isFinishing()).isTrue();
+    }
+
+    @Test
+    public void onCreate_authenticationPolicyProvided_startActivity() throws Exception {
+        final Intent intent = new Intent(Credentials.ACTION_MANAGE_CREDENTIALS);
+        intent.putExtra(KeyChain.EXTRA_AUTHENTICATION_POLICY, AUTHENTICATION_POLICY);
+        setupActivityWithAction(intent);
+
+        when(mDevicePolicyManager.getDeviceOwnerUser()).thenReturn(null);
+        when(mDevicePolicyManager.getProfileOwner()).thenReturn(null);
+        when(mActivity.getLaunchedFromPackage()).thenReturn("com.example.credapp");
+
+        mActivity.onCreate(null);
 
         assertThat(mActivity).isNotNull();
         assertThat(mActivity.isFinishing()).isFalse();
@@ -84,23 +174,10 @@
         assertThat((Button) mActivity.findViewById(R.id.dont_allow_button)).isNotNull();
     }
 
-    @Test
-    public void onCreate_dontAllowButtonClicked_finishActivity() {
-        final Intent intent = new Intent(Credentials.ACTION_MANAGE_CREDENTIALS);
-        intent.putExtra(KeyChain.EXTRA_AUTHENTICATION_POLICY, AUTHENTICATION_POLICY);
-
-        initActivity(intent);
-
-        Button dontAllowButton = mActivity.findViewById(R.id.dont_allow_button);
-        assertThat(dontAllowButton.hasOnClickListeners()).isTrue();
-        dontAllowButton.performClick();
-        assertThat(mActivity.isFinishing()).isTrue();
-        assertThat(mShadowActivity.getResultCode()).isEqualTo(Activity.RESULT_CANCELED);
+    private void setupActivityWithAction(Intent intent) throws Exception {
+        mActivity = spy(Robolectric.buildActivity(RequestManageCredentials.class, intent).get());
+        doReturn(mKeyChainConnection).when(mActivity).getKeyChainConnection(eq(mActivity), any());
+        doReturn(mDevicePolicyManager).when(mActivity).getSystemService(DevicePolicyManager.class);
+        when(mKeyChainConnection.getService()).thenReturn(mKeyChainService);
     }
-
-    private void initActivity(@NonNull Intent intent) {
-        mActivity = Robolectric.buildActivity(RequestManageCredentials.class, intent).setup().get();
-        mShadowActivity = shadowOf(mActivity);
-    }
-
 }
diff --git a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
index b5c6c44..c2c67e3 100644
--- a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
@@ -565,7 +565,8 @@
         final Intent settingsIntent = new Intent(Settings.ACTION_SETTINGS)
                 .setPackage(Utils.SETTINGS_PACKAGE_NAME);
         PendingIntent settingsPendingIntent =
-                PendingIntent.getActivity(mContext, 0, settingsIntent, 0);
+                PendingIntent.getActivity(mContext, 0, settingsIntent,
+                        PendingIntent.FLAG_IMMUTABLE);
 
         assertThat(pendingIntent).isEqualTo(settingsPendingIntent);
     }
diff --git a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
index 2c68269..6fb2eae 100644
--- a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
+++ b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
@@ -43,6 +43,7 @@
 import com.android.settings.security.SecurityFeatureProvider;
 import com.android.settings.slices.SlicesFeatureProvider;
 import com.android.settings.users.UserFeatureProvider;
+import com.android.settings.wifi.WifiTrackerLibProvider;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
 import org.mockito.Answers;
@@ -77,6 +78,8 @@
     public SearchFeatureProvider searchFeatureProvider;
     public ContextualCardFeatureProvider mContextualCardFeatureProvider;
 
+    public WifiTrackerLibProvider wifiTrackerLibProvider;
+
     /**
      * Call this in {@code @Before} method of the test class to use fake factory.
      */
@@ -120,6 +123,7 @@
         mBluetoothFeatureProvider = mock(BluetoothFeatureProvider.class);
         mAwareFeatureProvider = mock(AwareFeatureProvider.class);
         mFaceFeatureProvider = mock(FaceFeatureProvider.class);
+        wifiTrackerLibProvider = mock(WifiTrackerLibProvider.class);
     }
 
     @Override
@@ -231,4 +235,9 @@
     public FaceFeatureProvider getFaceFeatureProvider() {
         return mFaceFeatureProvider;
     }
+
+    @Override
+    public WifiTrackerLibProvider getWifiTrackerLibProvider() {
+        return wifiTrackerLibProvider;
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java
index 90c9172..50ddd2a 100644
--- a/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java
@@ -363,7 +363,7 @@
         mFragment.initialize(mActivity, mArguments);
 
         verify(mRemoveUserPref).setOnPreferenceClickListener(mFragment);
-        verify(mRemoveUserPref).setTitle(R.string.user_exit_guest_title);
+        verify(mRemoveUserPref).setTitle(R.string.user_exit_guest_menu);
         verify(mFragment, never()).removePreference(KEY_REMOVE_USER);
     }
 
diff --git a/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceWithExtraWidgetTest.java b/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceWithExtraWidgetTest.java
deleted file mode 100644
index 2e2d786..0000000
--- a/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceWithExtraWidgetTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (C) 2019 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.widget;
-
-import static com.android.settings.widget.RadioButtonPreferenceWithExtraWidget.EXTRA_WIDGET_VISIBILITY_GONE;
-import static com.android.settings.widget.RadioButtonPreferenceWithExtraWidget.EXTRA_WIDGET_VISIBILITY_INFO;
-import static com.android.settings.widget.RadioButtonPreferenceWithExtraWidget.EXTRA_WIDGET_VISIBILITY_SETTING;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.junit.Assert.assertEquals;
-
-import android.app.Application;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import androidx.preference.PreferenceViewHolder;
-
-import com.android.settings.R;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class RadioButtonPreferenceWithExtraWidgetTest {
-
-    private Application mContext;
-    private RadioButtonPreferenceWithExtraWidget mPreference;
-
-    private TextView mSummary;
-    private ImageView mExtraWidget;
-    private View mExtraWidgetDivider;
-
-    private boolean mIsClickListenerCalled = false;
-    private View.OnClickListener mClickListener = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            mIsClickListenerCalled = true;
-        }
-    };
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mPreference = new RadioButtonPreferenceWithExtraWidget(mContext);
-        mPreference.setSummary("test summary");
-
-        View view = LayoutInflater.from(mContext)
-                .inflate(R.layout.preference_radio_with_extra_widget, null);
-        PreferenceViewHolder preferenceViewHolder =
-                PreferenceViewHolder.createInstanceForTests(view);
-        mPreference.onBindViewHolder(preferenceViewHolder);
-
-        mSummary = view.findViewById(android.R.id.summary);
-        mExtraWidget = view.findViewById(R.id.radio_extra_widget);
-        mExtraWidgetDivider = view.findViewById(R.id.radio_extra_widget_divider);
-    }
-
-    @Test
-    public void shouldHaveRadioPreferenceWithExtraWidgetLayout() {
-        assertThat(mPreference.getLayoutResource())
-                .isEqualTo(R.layout.preference_radio_with_extra_widget);
-    }
-
-    @Test
-    public void iconSpaceReservedShouldBeFalse() {
-        assertThat(mPreference.isIconSpaceReserved()).isFalse();
-    }
-
-    @Test
-    public void summaryShouldBeVisible() {
-        assertEquals(View.VISIBLE, mSummary.getVisibility());
-    }
-
-    @Test
-    public void testSetExtraWidgetVisibility_gone() {
-        mPreference.setExtraWidgetVisibility(EXTRA_WIDGET_VISIBILITY_GONE);
-        assertEquals(View.GONE, mExtraWidget.getVisibility());
-        assertEquals(View.GONE, mExtraWidgetDivider.getVisibility());
-        assertThat(mExtraWidget.isClickable()).isFalse();
-    }
-
-    @Test
-    public void testSetExtraWidgetVisibility_info() {
-        mPreference.setExtraWidgetVisibility(EXTRA_WIDGET_VISIBILITY_INFO);
-        assertEquals(View.VISIBLE, mExtraWidget.getVisibility());
-        assertEquals(View.VISIBLE, mExtraWidgetDivider.getVisibility());
-        assertThat(mExtraWidget.isClickable()).isTrue();
-        assertEquals(mContext.getResources().getText(R.string.information_label),
-                mExtraWidget.getContentDescription());
-    }
-
-    @Test
-    public void testSetExtraWidgetVisibility_setting() {
-        mPreference.setExtraWidgetVisibility(EXTRA_WIDGET_VISIBILITY_SETTING);
-        assertEquals(View.VISIBLE, mExtraWidget.getVisibility());
-        assertEquals(View.VISIBLE, mExtraWidgetDivider.getVisibility());
-        assertThat(mExtraWidget.isClickable()).isTrue();
-        assertEquals(mContext.getResources().getText(R.string.settings_label),
-                mExtraWidget.getContentDescription());
-    }
-
-    @Test
-    public void testSetExtraWidgetOnClickListener() {
-        mPreference.setExtraWidgetOnClickListener(mClickListener);
-
-        assertThat(mIsClickListenerCalled).isFalse();
-        mExtraWidget.callOnClick();
-        assertThat(mIsClickListenerCalled).isTrue();
-    }
-
-    @Test
-    public void extraWidgetStaysEnabledWhenPreferenceIsDisabled() {
-        mPreference.setEnabled(false);
-        mExtraWidget.setEnabled(false);
-
-        assertThat(mExtraWidget.isEnabled()).isFalse();
-        mPreference.setExtraWidgetOnClickListener(mClickListener);
-        assertThat(mExtraWidget.isEnabled()).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragmentTest.java
index 70c7810..24d4c47 100644
--- a/tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragmentTest.java
@@ -20,6 +20,7 @@
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -41,6 +42,7 @@
 import androidx.fragment.app.FragmentActivity;
 
 import com.android.settings.R;
+import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.wifitrackerlib.WifiEntry;
 import com.android.wifitrackerlib.WifiPickerTracker;
 
@@ -82,6 +84,8 @@
     @Mock
     private WifiEntry mWifiEntry;
 
+    private FakeFeatureFactory mFakeFeatureFactory;
+
     @Mock
     private WifiPickerTracker mWifiPickerTracker;
 
@@ -106,6 +110,8 @@
         mSavedWpaConfigurationEntry = generateRegularWifiConfiguration(FAKE_NEW_SAVED_WPA_SSID,
                 WifiConfiguration.KeyMgmt.WPA_PSK, "\"1234567890\"");
 
+        mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
+
         mAddAppNetworksFragment.mWifiPickerTracker = mWifiPickerTracker;
         setUpOneScannedNetworkWithScanedLevel4();
     }
@@ -485,6 +491,9 @@
     }
 
     private void setupFragment() {
+        when(mFakeFeatureFactory.wifiTrackerLibProvider.createWifiPickerTracker(
+                any(), any(), any(), any(), any(), anyLong(), anyLong(), any()))
+                .thenReturn(mWifiPickerTracker);
         FragmentController.setupFragment(mAddAppNetworksFragment);
     }
 
diff --git a/tests/robotests/src/com/android/settings/wifi/slice/WifiScanWorkerTest.java b/tests/robotests/src/com/android/settings/wifi/slice/WifiScanWorkerTest.java
index 395048c..2a8d265 100644
--- a/tests/robotests/src/com/android/settings/wifi/slice/WifiScanWorkerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/slice/WifiScanWorkerTest.java
@@ -20,11 +20,14 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import androidx.lifecycle.Lifecycle;
 
+import com.android.wifitrackerlib.MergedCarrierEntry;
 import com.android.wifitrackerlib.WifiEntry;
 import com.android.wifitrackerlib.WifiPickerTracker;
 
@@ -44,6 +47,8 @@
     private WifiScanWorker mWifiScanWorker;
     @Mock
     WifiPickerTracker mWifiPickerTracker;
+    @Mock
+    MergedCarrierEntry mMergedCarrierEntry;
 
     @Before
     public void setUp() {
@@ -51,6 +56,7 @@
 
         mWifiScanWorker = new WifiScanWorker(RuntimeEnvironment.application, WIFI_SLICE_URI);
         mWifiScanWorker.mWifiPickerTracker = mWifiPickerTracker;
+        when(mWifiPickerTracker.getMergedCarrierEntry()).thenReturn(mMergedCarrierEntry);
     }
 
     @Test
@@ -102,4 +108,24 @@
 
         assertThat(mWifiScanWorker.getWifiEntry(key)).isEqualTo(reachableWifiEntry);
     }
+
+    @Test
+    public void setCarrierNetworkEnabled_shouldCallMergedCarrierEntrySetEnabled() {
+        mWifiScanWorker.setCarrierNetworkEnabled(true);
+
+        verify(mMergedCarrierEntry).setEnabled(true);
+
+        mWifiScanWorker.setCarrierNetworkEnabled(false);
+
+        verify(mMergedCarrierEntry).setEnabled(false);
+    }
+
+    @Test
+    public void connectCarrierNetwork_shouldCallMergedCarrierEntryConnect() {
+        when(mMergedCarrierEntry.canConnect()).thenReturn(true);
+
+        mWifiScanWorker.connectCarrierNetwork();
+
+        verify(mMergedCarrierEntry).connect(any());
+    }
 }
diff --git a/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/ApprovalPreferenceControllerTest.java b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/ApprovalPreferenceControllerTest.java
new file mode 100644
index 0000000..064f813
--- /dev/null
+++ b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/ApprovalPreferenceControllerTest.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2020 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.specialaccess.notificationaccess;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.NotificationManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+
+import androidx.preference.SwitchPreference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.testutils.FakeFeatureFactory;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class ApprovalPreferenceControllerTest {
+
+    private Context mContext;
+    private FakeFeatureFactory mFeatureFactory;
+    @Mock
+    private NotificationAccessDetails mFragment;
+    private ApprovalPreferenceController mController;
+    @Mock
+    NotificationManager mNm;
+    @Mock
+    PackageManager mPm;
+    PackageInfo mPkgInfo;
+    ComponentName mCn = new ComponentName("a", "b");
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mFeatureFactory = FakeFeatureFactory.setupForTest();
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        doReturn(mContext).when(mFragment).getContext();
+
+        mPkgInfo = new PackageInfo();
+        mPkgInfo.applicationInfo = mock(ApplicationInfo.class);
+        when(mPkgInfo.applicationInfo.loadLabel(mPm)).thenReturn("LABEL");
+
+        mController = new ApprovalPreferenceController(mContext, "key");
+        mController.setCn(mCn);
+        mController.setNm(mNm);
+        mController.setParent(mFragment);
+        mController.setPkgInfo(mPkgInfo);
+    }
+
+    @Test
+    public void updateState_checked() {
+        when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);
+        SwitchPreference pref = new SwitchPreference(mContext);
+
+        mController.updateState(pref);
+        assertThat(pref.isChecked()).isTrue();
+    }
+
+    @Test
+    public void enable() {
+        mController.enable(mCn);
+        verify(mFeatureFactory.metricsFeatureProvider).action(
+                mContext,
+                MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_NOTIVIEW_ALLOW,
+                "a");
+
+        verify(mNm).setNotificationListenerAccessGranted(mCn, true);
+    }
+
+    @Test
+    public void disable() {
+        mController.disable(mCn);
+        verify(mFeatureFactory.metricsFeatureProvider).action(
+                mContext,
+                MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_NOTIVIEW_ALLOW,
+                "a");
+
+        verify(mNm).setNotificationListenerAccessGranted(mCn, false);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/TypeFilterPreferenceControllerTest.java b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/TypeFilterPreferenceControllerTest.java
new file mode 100644
index 0000000..3014066
--- /dev/null
+++ b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/TypeFilterPreferenceControllerTest.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2021 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.specialaccess.notificationaccess;
+
+import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_CONVERSATIONS;
+import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_ONGOING;
+import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_SILENT;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.service.notification.NotificationListenerFilter;
+import android.util.ArraySet;
+
+import androidx.preference.MultiSelectListPreference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.notification.NotificationBackend;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.Set;
+
+@RunWith(AndroidJUnit4.class)
+public class TypeFilterPreferenceControllerTest {
+
+    private Context mContext;
+    private TypeFilterPreferenceController mController;
+    @Mock
+    NotificationBackend mNm;
+    ComponentName mCn = new ComponentName("a", "b");
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = ApplicationProvider.getApplicationContext();
+
+        mController = new TypeFilterPreferenceController(mContext, "key");
+        mController.setCn(mCn);
+        mController.setNm(mNm);
+        mController.setUserId(0);
+    }
+
+    @Test
+    public void updateState_enabled() {
+        when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);
+        when(mNm.getListenerFilter(mCn, 0)).thenReturn(new NotificationListenerFilter());
+        MultiSelectListPreference pref = new MultiSelectListPreference(mContext);
+
+        mController.updateState(pref);
+        assertThat(pref.isEnabled()).isTrue();
+    }
+
+    @Test
+    public void updateState_disabled() {
+        when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(false);
+        when(mNm.getListenerFilter(mCn, 0)).thenReturn(new NotificationListenerFilter());
+        MultiSelectListPreference pref = new MultiSelectListPreference(mContext);
+
+        mController.updateState(pref);
+        assertThat(pref.isEnabled()).isFalse();
+    }
+
+    @Test
+    public void updateState() {
+        NotificationListenerFilter nlf = new NotificationListenerFilter(FLAG_FILTER_TYPE_ONGOING
+                | FLAG_FILTER_TYPE_SILENT, new ArraySet<>());
+        when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);
+        when(mNm.getListenerFilter(mCn, 0)).thenReturn(nlf);
+
+        MultiSelectListPreference pref = new MultiSelectListPreference(mContext);
+        mController.updateState(pref);
+
+        assertThat(pref.getValues()).containsExactlyElementsIn(
+                new String[] {String.valueOf(FLAG_FILTER_TYPE_ONGOING),
+                        String.valueOf(FLAG_FILTER_TYPE_SILENT)});
+        assertThat(pref.getSummary()).isNotNull();
+    }
+
+    @Test
+    public void getSummary() {
+        NotificationListenerFilter nlf = new NotificationListenerFilter(FLAG_FILTER_TYPE_ONGOING
+                | FLAG_FILTER_TYPE_CONVERSATIONS, new ArraySet<>());
+        when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);
+        when(mNm.getListenerFilter(mCn, 0)).thenReturn(nlf);
+
+        MultiSelectListPreference pref = new MultiSelectListPreference(mContext);
+        mController.updateState(pref);
+
+        assertThat(mController.getSummary().toString()).ignoringCase().contains("ongoing");
+        assertThat(mController.getSummary().toString()).ignoringCase().contains("conversation");
+    }
+
+    @Test
+    public void onPreferenceChange() {
+        NotificationListenerFilter nlf = new NotificationListenerFilter(FLAG_FILTER_TYPE_ONGOING
+                | FLAG_FILTER_TYPE_CONVERSATIONS, new ArraySet<>());
+        when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);
+        when(mNm.getListenerFilter(mCn, 0)).thenReturn(nlf);
+
+        MultiSelectListPreference pref = new MultiSelectListPreference(mContext);
+
+        mController.onPreferenceChange(pref, Set.of("8", "1", "4"));
+
+        ArgumentCaptor<NotificationListenerFilter> captor =
+                ArgumentCaptor.forClass(NotificationListenerFilter.class);
+        verify(mNm).setListenerFilter(eq(mCn), eq(0), captor.capture());
+        assertThat(captor.getValue().getTypes()).isEqualTo(FLAG_FILTER_TYPE_CONVERSATIONS
+                | FLAG_FILTER_TYPE_SILENT | FLAG_FILTER_TYPE_ONGOING);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/AirplaneSafeNetworksSliceTest.java b/tests/unit/src/com/android/settings/network/AirplaneSafeNetworksSliceTest.java
index c479c25..a344ab6 100644
--- a/tests/unit/src/com/android/settings/network/AirplaneSafeNetworksSliceTest.java
+++ b/tests/unit/src/com/android/settings/network/AirplaneSafeNetworksSliceTest.java
@@ -35,6 +35,7 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.android.settings.testutils.AirplaneModeRule;
+import com.android.settings.testutils.ResourcesUtils;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -47,9 +48,6 @@
 @RunWith(AndroidJUnit4.class)
 public class AirplaneSafeNetworksSliceTest {
 
-    private static final String VIEW_AIRPLANE_SAFE_NETWORKS = "View airplane-safe networks";
-    private static final String TURN_OFF_AIRPLANE_MODE = "Turn off Airplane Mode";
-
     @Rule
     public MockitoRule mMocks = MockitoJUnit.rule();
     @Rule
@@ -88,7 +86,8 @@
         assertThat(slice).isNotNull();
         final SliceItem sliceTitle =
                 SliceMetadata.from(mContext, slice).getListContent().getHeader().getTitleItem();
-        assertThat(sliceTitle.getText()).isEqualTo(VIEW_AIRPLANE_SAFE_NETWORKS);
+        assertThat(sliceTitle.getText()).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext, "view_airplane_safe_networks"));
     }
 
     @Test
@@ -101,7 +100,8 @@
         assertThat(slice).isNotNull();
         final SliceItem sliceTitle =
                 SliceMetadata.from(mContext, slice).getListContent().getHeader().getTitleItem();
-        assertThat(sliceTitle.getText()).isEqualTo(TURN_OFF_AIRPLANE_MODE);
+        assertThat(sliceTitle.getText()).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext, "turn_off_airplane_mode"));
     }
 
     @Test
diff --git a/tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java b/tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java
index 9c16b8a..076ce2b 100644
--- a/tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java
+++ b/tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java
@@ -16,10 +16,13 @@
 
 package com.android.settings.network;
 
+import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -48,9 +51,11 @@
 
 import com.android.settings.Utils;
 import com.android.settings.network.telephony.NetworkProviderWorker;
+import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.ResourcesUtils;
 import com.android.settings.wifi.slice.WifiSliceItem;
 import com.android.wifitrackerlib.WifiEntry;
+import com.android.wifitrackerlib.WifiPickerTracker;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -98,12 +103,22 @@
     @Mock
     GridRowBuilder mMockGridRowBuilderAllNetworkUnavailable;
 
+    private FakeFeatureFactory mFeatureFactory;
+    @Mock
+    private WifiPickerTracker mWifiPickerTracker;
+
     @Before
     @UiThreadTest
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = spy(ApplicationProvider.getApplicationContext());
 
+        mFeatureFactory = FakeFeatureFactory.setupForTest();
+        when(mFeatureFactory.wifiTrackerLibProvider
+                .createWifiPickerTracker(
+                        any(), any(), any(), any(), any(), anyLong(), anyLong(), any()))
+                .thenReturn(mWifiPickerTracker);
+
         when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
         when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager);
         when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
@@ -113,13 +128,14 @@
 
         // Set-up specs for SliceMetadata.
         SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
-        mMockNetworkProviderWorker = new MockNetworkProviderWorker(mContext,
-                PROVIDER_MODEL_SLICE_URI);
+        mMockNetworkProviderWorker = spy(new MockNetworkProviderWorker(mContext,
+                PROVIDER_MODEL_SLICE_URI));
         mMockProviderModelSlice = new MockProviderModelSlice(mContext, mMockNetworkProviderWorker);
         mListBuilder = spy(new ListBuilder(mContext, PROVIDER_MODEL_SLICE_URI,
                 ListBuilder.INFINITY).setAccentColor(-1));
         when(mProviderModelSliceHelper.createListBuilder(PROVIDER_MODEL_SLICE_URI)).thenReturn(
                 mListBuilder);
+        when(mProviderModelSliceHelper.getSubscriptionManager()).thenReturn(mSubscriptionManager);
 
         mWifiList = new ArrayList<>();
         mMockNetworkProviderWorker.updateSelfResults(mWifiList);
@@ -330,4 +346,33 @@
             return mNetworkProviderWorker;
         }
     }
+
+    @Test
+    public void onNotifyChange_intentToggleActionOn_shouldSetCarrierNetworkEnabledTrue() {
+        Intent intent = mMockProviderModelSlice.getBroadcastIntent(mContext).getIntent();
+        intent.putExtra(EXTRA_TOGGLE_STATE, true);
+
+        mMockProviderModelSlice.onNotifyChange(intent);
+
+        verify(mMockNetworkProviderWorker).setCarrierNetworkEnabled(true);
+    }
+
+    @Test
+    public void onNotifyChange_intentToggleActionOff_shouldSetCarrierNetworkEnabledFalse() {
+        Intent intent = mMockProviderModelSlice.getBroadcastIntent(mContext).getIntent();
+        intent.putExtra(EXTRA_TOGGLE_STATE, false);
+
+        mMockProviderModelSlice.onNotifyChange(intent);
+
+        verify(mMockNetworkProviderWorker).setCarrierNetworkEnabled(false);
+    }
+
+    @Test
+    public void onNotifyChange_intentPrimaryAction_shouldConnectCarrierNetwork() {
+        Intent intent = mMockProviderModelSlice.getBroadcastIntent(mContext).getIntent();
+
+        mMockProviderModelSlice.onNotifyChange(intent);
+
+        verify(mMockNetworkProviderWorker).connectCarrierNetwork();
+    }
 }
diff --git a/tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java
new file mode 100644
index 0000000..27dd2aa
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java
@@ -0,0 +1,673 @@
+/*
+ * Copyright (C) 2020 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.network;
+
+import static android.telephony.SignalStrength.NUM_SIGNAL_STRENGTH_BINS;
+import static android.telephony.SignalStrength.SIGNAL_STRENGTH_GOOD;
+import static android.telephony.SignalStrength.SIGNAL_STRENGTH_GREAT;
+import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import android.net.ConnectivityManager;
+import android.net.Network;
+import android.net.NetworkCapabilities;
+import android.os.Looper;
+import android.provider.Settings;
+import android.telephony.ServiceState;
+import android.telephony.SignalStrength;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.LifecycleRegistry;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.Utils;
+import com.android.settings.network.SubscriptionsPreferenceController.SubsPrefCtrlInjector;
+import com.android.settings.testutils.ResourcesUtils;
+import com.android.settings.wifi.WifiPickerTrackerHelper;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+public class SubscriptionsPreferenceControllerTest {
+    private static final String KEY = "preference_group";
+
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    @Mock
+    private ConnectivityManager mConnectivityManager;
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private TelephonyManager mTelephonyManagerForSub;
+    @Mock
+    private Network mActiveNetwork;
+    @Mock
+    private Lifecycle mLifecycle;
+    @Mock
+    private LifecycleOwner mLifecycleOwner;
+    @Mock
+    private WifiPickerTrackerHelper mWifiPickerTrackerHelper;
+    private LifecycleRegistry mLifecycleRegistry;
+    private int mOnChildUpdatedCount;
+    private Context mContext;
+    private SubscriptionsPreferenceController.UpdateListener mUpdateListener;
+    private PreferenceCategory mPreferenceCategory;
+    private PreferenceScreen mPreferenceScreen;
+    private PreferenceManager mPreferenceManager;
+    private NetworkCapabilities mNetworkCapabilities;
+
+    private FakeSubscriptionsPreferenceController mController;
+    private static SubsPrefCtrlInjector sInjector;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+        mLifecycleRegistry = new LifecycleRegistry(mLifecycleOwner);
+
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+        when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager);
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+        when(mTelephonyManager.createForSubscriptionId(anyInt())).thenReturn(mTelephonyManager);
+        when(mConnectivityManager.getActiveNetwork()).thenReturn(mActiveNetwork);
+        when(mConnectivityManager.getNetworkCapabilities(mActiveNetwork))
+                .thenReturn(mNetworkCapabilities);
+        when(mLifecycleOwner.getLifecycle()).thenReturn(mLifecycleRegistry);
+
+        mPreferenceManager = new PreferenceManager(mContext);
+        mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext);
+        mPreferenceScreen.setInitialExpandedChildrenCount(3);
+        mPreferenceCategory = new PreferenceCategory(mContext);
+        mPreferenceCategory.setKey(KEY);
+        mPreferenceCategory.setOrderingAsAdded(true);
+        mPreferenceScreen.addPreference(mPreferenceCategory);
+
+        mOnChildUpdatedCount = 0;
+        mUpdateListener = () -> mOnChildUpdatedCount++;
+        sInjector = spy(new SubsPrefCtrlInjector());
+        initializeMethod(true, 1, 1, 1, false, false);
+        mController =  new FakeSubscriptionsPreferenceController(mContext, mLifecycle,
+                mUpdateListener, KEY, 5);
+        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 0);
+    }
+
+    @After
+    public void tearDown() {
+        SubscriptionUtil.setActiveSubscriptionsForTesting(null);
+    }
+
+    @Test
+    public void isAvailable_oneSubscription_availableFalse() {
+        setupMockSubscriptions(1);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_oneSubAndProviderOn_availableTrue() {
+        doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
+        setupMockSubscriptions(1);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_twoSubscriptions_availableTrue() {
+        setupMockSubscriptions(2);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_fiveSubscriptions_availableTrue() {
+        doReturn(true).when(sInjector).canSubscriptionBeDisplayed(mContext, 0);
+        setupMockSubscriptions(5);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_airplaneModeOn_availableFalse() {
+        setupMockSubscriptions(2);
+
+        assertThat(mController.isAvailable()).isTrue();
+
+        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    @UiThreadTest
+    public void onAirplaneModeChanged_airplaneModeTurnedOn_eventFired() {
+        setupMockSubscriptions(2);
+
+        mController.onResume();
+        mController.displayPreference(mPreferenceScreen);
+
+        assertThat(mController.isAvailable()).isTrue();
+
+        final int updateCountBeforeModeChange = mOnChildUpdatedCount;
+        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1);
+
+        mController.onAirplaneModeChanged(true);
+
+        assertThat(mController.isAvailable()).isFalse();
+        assertThat(mOnChildUpdatedCount).isEqualTo(updateCountBeforeModeChange + 1);
+    }
+
+    @Test
+    @UiThreadTest
+    public void onAirplaneModeChanged_airplaneModeTurnedOff_eventFired() {
+        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1);
+        setupMockSubscriptions(2);
+
+        mController.onResume();
+        mController.displayPreference(mPreferenceScreen);
+        assertThat(mController.isAvailable()).isFalse();
+
+        final int updateCountBeforeModeChange = mOnChildUpdatedCount;
+        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 0);
+
+        mController.onAirplaneModeChanged(true);
+
+        assertThat(mController.isAvailable()).isTrue();
+        assertThat(mOnChildUpdatedCount).isEqualTo(updateCountBeforeModeChange + 1);
+    }
+
+    @Test
+    @UiThreadTest
+    public void onSubscriptionsChanged_countBecameTwo_eventFired() {
+        final List<SubscriptionInfo> subs = setupMockSubscriptions(2);
+        SubscriptionUtil.setActiveSubscriptionsForTesting(subs.subList(0, 1));
+
+        mController.onResume();
+        mController.displayPreference(mPreferenceScreen);
+
+        assertThat(mController.isAvailable()).isFalse();
+
+        final int updateCountBeforeSubscriptionChange = mOnChildUpdatedCount;
+        SubscriptionUtil.setActiveSubscriptionsForTesting(subs);
+
+        mController.onSubscriptionsChanged();
+
+        assertThat(mController.isAvailable()).isTrue();
+        assertThat(mOnChildUpdatedCount).isEqualTo(updateCountBeforeSubscriptionChange + 1);
+    }
+
+    @Test
+    @UiThreadTest
+    public void onSubscriptionsChanged_countBecameOne_eventFiredAndPrefsRemoved() {
+        final List<SubscriptionInfo> subs = setupMockSubscriptions(2);
+
+        mController.onResume();
+        mController.displayPreference(mPreferenceScreen);
+
+        assertThat(mController.isAvailable()).isTrue();
+        assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(2);
+
+        final int updateCountBeforeSubscriptionChange = mOnChildUpdatedCount;
+        SubscriptionUtil.setActiveSubscriptionsForTesting(subs.subList(0, 1));
+
+        mController.onSubscriptionsChanged();
+
+        assertThat(mController.isAvailable()).isFalse();
+        assertThat(mOnChildUpdatedCount).isEqualTo(updateCountBeforeSubscriptionChange + 1);
+        assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(0);
+    }
+
+    @Test
+    @UiThreadTest
+    public void onSubscriptionsChanged_subscriptionReplaced_preferencesChanged() {
+        final List<SubscriptionInfo> subs = setupMockSubscriptions(3);
+
+        // Start out with only sub1 and sub2.
+        SubscriptionUtil.setActiveSubscriptionsForTesting(subs.subList(0, 2));
+        mController.onResume();
+        mController.displayPreference(mPreferenceScreen);
+
+        assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(2);
+        assertThat(mPreferenceCategory.getPreference(0).getTitle()).isEqualTo("sub2");
+        assertThat(mPreferenceCategory.getPreference(1).getTitle()).isEqualTo("sub1");
+
+        // Now replace sub2 with sub3, and make sure the old preference was removed and the new
+        // preference was added.
+        final int updateCountBeforeSubscriptionChange = mOnChildUpdatedCount;
+        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(subs.get(0), subs.get(2)));
+        mController.onSubscriptionsChanged();
+
+        assertThat(mController.isAvailable()).isTrue();
+        assertThat(mOnChildUpdatedCount).isEqualTo(updateCountBeforeSubscriptionChange + 1);
+        assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(2);
+        assertThat(mPreferenceCategory.getPreference(0).getTitle()).isEqualTo("sub3");
+        assertThat(mPreferenceCategory.getPreference(1).getTitle()).isEqualTo("sub1");
+    }
+
+    @Test
+    public void getSummary_twoSubsOneDefaultForEverythingDataActive() {
+        setupMockSubscriptions(2);
+
+        doReturn(11).when(sInjector).getDefaultSmsSubscriptionId();
+        doReturn(11).when(sInjector).getDefaultVoiceSubscriptionId();
+        when(mTelephonyManager.isDataEnabled()).thenReturn(true);
+        doReturn(true).when(sInjector).isActiveCellularNetwork(mContext);
+
+        assertThat(mController.getSummary(11, true)).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext, "default_for_calls_and_sms")
+                        + System.lineSeparator()
+                        + ResourcesUtils.getResourcesString(mContext, "mobile_data_active"));
+
+        assertThat(mController.getSummary(22, false)).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext, "subscription_available"));
+    }
+
+    @Test
+    public void getSummary_twoSubsOneDefaultForEverythingDataNotActive() {
+        setupMockSubscriptions(2, 1, true);
+
+        doReturn(1).when(sInjector).getDefaultSmsSubscriptionId();
+        doReturn(1).when(sInjector).getDefaultVoiceSubscriptionId();
+
+        assertThat(mController.getSummary(1, true)).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext, "default_for_calls_and_sms")
+                        + System.lineSeparator()
+                        + ResourcesUtils.getResourcesString(mContext, "default_for_mobile_data"));
+
+        assertThat(mController.getSummary(2, false)).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext, "subscription_available"));
+    }
+
+    @Test
+    public void getSummary_twoSubsOneDefaultForEverythingDataDisabled() {
+        setupMockSubscriptions(2);
+
+        doReturn(1).when(sInjector).getDefaultSmsSubscriptionId();
+        doReturn(1).when(sInjector).getDefaultVoiceSubscriptionId();
+
+        assertThat(mController.getSummary(1, true)).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext, "default_for_calls_and_sms")
+                        + System.lineSeparator()
+                        + ResourcesUtils.getResourcesString(mContext, "mobile_data_off"));
+
+        assertThat(mController.getSummary(2, false)).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext, "subscription_available"));
+    }
+
+    @Test
+    public void getSummary_twoSubsOneForCallsAndDataOneForSms() {
+        setupMockSubscriptions(2, 1, true);
+
+        doReturn(2).when(sInjector).getDefaultSmsSubscriptionId();
+        doReturn(1).when(sInjector).getDefaultVoiceSubscriptionId();
+
+        assertThat(mController.getSummary(1, true)).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext, "default_for_calls")
+                        + System.lineSeparator()
+                        + ResourcesUtils.getResourcesString(mContext, "default_for_mobile_data"));
+
+        assertThat(mController.getSummary(2, false)).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext, "default_for_sms"));
+    }
+
+    @Test
+    @UiThreadTest
+    public void setIcon_greatSignal_correctLevels() {
+        final List<SubscriptionInfo> subs = setupMockSubscriptions(2, 1, true);
+        setMockSubSignalStrength(subs, 0, SIGNAL_STRENGTH_GREAT);
+        setMockSubSignalStrength(subs, 1, SIGNAL_STRENGTH_GREAT);
+        final Preference pref = new Preference(mContext);
+        final Drawable greatDrawWithoutCutOff = mock(Drawable.class);
+        doReturn(greatDrawWithoutCutOff).when(sInjector)
+                .getIcon(mContext, 4, NUM_SIGNAL_STRENGTH_BINS, true);
+
+        mController.setIcon(pref, 1, true /* isDefaultForData */);
+        assertThat(pref.getIcon()).isEqualTo(greatDrawWithoutCutOff);
+
+        final Drawable greatDrawWithCutOff = mock(Drawable.class);
+        doReturn(greatDrawWithCutOff).when(sInjector)
+                .getIcon(mContext, 4, NUM_SIGNAL_STRENGTH_BINS, true);
+        mController.setIcon(pref, 2, false /* isDefaultForData */);
+        assertThat(pref.getIcon()).isEqualTo(greatDrawWithCutOff);
+    }
+
+    @Test
+    @UiThreadTest
+    public void displayPreference_providerAndHasSim_showPreference() {
+        final List<SubscriptionInfo> sub = setupMockSubscriptions(1);
+        doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
+        doReturn(sub.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
+
+        mController.onResume();
+        mController.displayPreference(mPreferenceScreen);
+
+        assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(1);
+        assertThat(mPreferenceCategory.getPreference(0).getTitle()).isEqualTo("sub1");
+    }
+
+    @Test
+    @UiThreadTest
+    public void displayPreference_providerAndHasMultiSim_showDataSubPreference() {
+        final List<SubscriptionInfo> sub = setupMockSubscriptions(2);
+        doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
+        doReturn(sub.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
+
+        mController.onResume();
+        mController.displayPreference(mPreferenceScreen);
+
+        assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(1);
+        assertThat(mPreferenceCategory.getPreference(0).getTitle()).isEqualTo("sub1");
+    }
+
+    @Test
+    @UiThreadTest
+    public void displayPreference_providerAndNoSim_noPreference() {
+        doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
+        doReturn(null).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
+
+        mController.onResume();
+        mController.displayPreference(mPreferenceScreen);
+
+        assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(0);
+    }
+
+    @Test
+    @UiThreadTest
+    public void onAirplaneModeChanged_providerAndHasSim_noPreference() {
+        setupMockSubscriptions(1);
+        doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
+        mController.onResume();
+        mController.displayPreference(mPreferenceScreen);
+        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1);
+
+        mController.onAirplaneModeChanged(true);
+
+        assertThat(mController.isAvailable()).isFalse();
+        assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(0);
+    }
+
+    @Test
+    @UiThreadTest
+    public void dataSubscriptionChanged_providerAndHasMultiSim_showSubId1Preference() {
+        final List<SubscriptionInfo> sub = setupMockSubscriptions(2);
+        doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
+        doReturn(sub.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
+        Intent intent = new Intent(TelephonyManager.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED);
+
+        mController.onResume();
+        mController.displayPreference(mPreferenceScreen);
+        mController.mDataSubscriptionChangedReceiver.onReceive(mContext, intent);
+
+        assertThat(mController.isAvailable()).isTrue();
+        assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(1);
+        assertThat(mPreferenceCategory.getPreference(0).getTitle()).isEqualTo("sub1");
+    }
+
+    @Test
+    @UiThreadTest
+    public void dataSubscriptionChanged_providerAndHasMultiSim_showSubId2Preference() {
+        final List<SubscriptionInfo> sub = setupMockSubscriptions(2);
+        final int subId = sub.get(0).getSubscriptionId();
+        doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
+        doReturn(sub.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
+        Intent intent = new Intent(TelephonyManager.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED);
+
+        mController.onResume();
+        mController.displayPreference(mPreferenceScreen);
+
+        assertThat(mController.isAvailable()).isTrue();
+        assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(1);
+        assertThat(mPreferenceCategory.getPreference(0).getTitle()).isEqualTo("sub1");
+
+        doReturn(sub.get(1)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
+
+        mController.mDataSubscriptionChangedReceiver.onReceive(mContext, intent);
+
+        assertThat(mController.isAvailable()).isTrue();
+        assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(1);
+        assertThat(mPreferenceCategory.getPreference(0).getTitle()).isEqualTo("sub2");
+    }
+
+    @Test
+    @UiThreadTest
+    public void getIcon_cellularIsActive_iconColorIsAccentDefaultColor() {
+        final List<SubscriptionInfo> sub = setupMockSubscriptions(1);
+        doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
+        doReturn(sub.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
+        Drawable icon = mock(Drawable.class);
+        doReturn(icon).when(sInjector).getIcon(any(), anyInt(), anyInt(), eq(false));
+        setupGetIconConditions(sub.get(0).getSubscriptionId(), true, true,
+                TelephonyManager.DATA_CONNECTED, ServiceState.STATE_IN_SERVICE);
+
+        mController.onResume();
+        mController.displayPreference(mPreferenceScreen);
+
+        verify(icon).setTint(Utils.getColorAccentDefaultColor(mContext));
+    }
+
+    @Test
+    @UiThreadTest
+    public void getIcon_dataStateConnectedAndMobileDataOn_iconIsSignalIcon() {
+        final List<SubscriptionInfo> subs = setupMockSubscriptions(1);
+        final int subId = subs.get(0).getSubscriptionId();
+        doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
+        doReturn(subs.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
+        Drawable icon = mock(Drawable.class);
+        doReturn(icon).when(sInjector).getIcon(any(), anyInt(), anyInt(), eq(false));
+        setupGetIconConditions(subId, false, true,
+                TelephonyManager.DATA_CONNECTED, ServiceState.STATE_IN_SERVICE);
+        mController.onResume();
+        mController.displayPreference(mPreferenceScreen);
+        Drawable actualIcon = mPreferenceCategory.getPreference(0).getIcon();
+
+        assertThat(icon).isEqualTo(actualIcon);
+    }
+
+    @Test
+    @UiThreadTest
+    public void getIcon_voiceInServiceAndMobileDataOff_iconIsSignalIcon() {
+        final List<SubscriptionInfo> subs = setupMockSubscriptions(1);
+        final int subId = subs.get(0).getSubscriptionId();
+        doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
+        doReturn(subs.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
+        Drawable icon = mock(Drawable.class);
+        doReturn(icon).when(sInjector).getIcon(any(), anyInt(), anyInt(), eq(false));
+
+        setupGetIconConditions(subId, false, false,
+                TelephonyManager.DATA_DISCONNECTED, ServiceState.STATE_IN_SERVICE);
+
+        mController.onResume();
+        mController.displayPreference(mPreferenceScreen);
+        Drawable actualIcon = mPreferenceCategory.getPreference(0).getIcon();
+        doReturn(TelephonyManager.DATA_CONNECTED).when(mTelephonyManagerForSub).getDataState();
+
+        assertThat(icon).isEqualTo(actualIcon);
+    }
+
+    @Test
+    public void connectCarrierNetwork_isDataEnabled_helperConnect() {
+        when(mTelephonyManager.isDataEnabled()).thenReturn(true);
+        mController.setWifiPickerTrackerHelper(mWifiPickerTrackerHelper);
+
+        mController.connectCarrierNetwork();
+
+        verify(mWifiPickerTrackerHelper).connectCarrierNetwork(any());
+    }
+
+    @Test
+    public void connectCarrierNetwork_isNotDataEnabled_helperNeverConnect() {
+        when(mTelephonyManager.isDataEnabled()).thenReturn(false);
+        mController.setWifiPickerTrackerHelper(mWifiPickerTrackerHelper);
+
+        mController.connectCarrierNetwork();
+
+        verify(mWifiPickerTrackerHelper, never()).connectCarrierNetwork(any());
+    }
+
+    private void setupGetIconConditions(int subId, boolean isActiveCellularNetwork,
+            boolean isDataEnable, int dataState, int servicestate) {
+        doReturn(mTelephonyManagerForSub).when(mTelephonyManager).createForSubscriptionId(subId);
+        doReturn(isActiveCellularNetwork).when(sInjector).isActiveCellularNetwork(mContext);
+        doReturn(isDataEnable).when(mTelephonyManagerForSub).isDataEnabled();
+        doReturn(dataState).when(mTelephonyManagerForSub).getDataState();
+        ServiceState ss = mock(ServiceState.class);
+        doReturn(ss).when(mTelephonyManagerForSub).getServiceState();
+        doReturn(servicestate).when(ss).getState();
+    }
+
+    private List<SubscriptionInfo> setupMockSubscriptions(int count) {
+        return setupMockSubscriptions(count, 0, true);
+    }
+
+    /** Helper method to setup several mock active subscriptions. The generated subscription id's
+     * start at 1.
+     *
+     * @param count How many subscriptions to create
+     * @param defaultDataSubId The subscription id of the default data subscription - pass
+     *                         INVALID_SUBSCRIPTION_ID if there should not be one
+     * @param mobileDataEnabled Whether mobile data should be considered enabled for the default
+     *                          data subscription
+     */
+    private List<SubscriptionInfo> setupMockSubscriptions(int count, int defaultDataSubId,
+            boolean mobileDataEnabled) {
+        if (defaultDataSubId != INVALID_SUBSCRIPTION_ID) {
+            when(sInjector.getDefaultDataSubscriptionId()).thenReturn(defaultDataSubId);
+        }
+        final ArrayList<SubscriptionInfo> infos = new ArrayList<>();
+        for (int i = 0; i < count; i++) {
+            final int subscriptionId = i + 1;
+            final SubscriptionInfo info = mock(SubscriptionInfo.class);
+            final TelephonyManager mgrForSub = mock(TelephonyManager.class);
+            final SignalStrength signalStrength = mock(SignalStrength.class);
+
+            if (subscriptionId == defaultDataSubId) {
+                when(mgrForSub.isDataEnabled()).thenReturn(mobileDataEnabled);
+            }
+            when(info.getSubscriptionId()).thenReturn(subscriptionId);
+            when(info.getDisplayName()).thenReturn("sub" + (subscriptionId));
+            doReturn(mgrForSub).when(mTelephonyManager).createForSubscriptionId(eq(subscriptionId));
+            when(mgrForSub.getSignalStrength()).thenReturn(signalStrength);
+            when(signalStrength.getLevel()).thenReturn(SIGNAL_STRENGTH_GOOD);
+            doReturn(true).when(sInjector).canSubscriptionBeDisplayed(mContext, subscriptionId);
+            infos.add(info);
+        }
+        SubscriptionUtil.setActiveSubscriptionsForTesting(infos);
+        return infos;
+    }
+
+    /**
+     * Helper method to set the signal strength returned for a mock subscription
+     * @param subs The list of subscriptions
+     * @param index The index in of the subscription in |subs| to change
+     * @param level The signal strength level to return for the subscription. Pass -1 to force
+     *              return of a null SignalStrength object for the subscription.
+     */
+    private void setMockSubSignalStrength(List<SubscriptionInfo> subs, int index, int level) {
+        final int subId =  subs.get(index).getSubscriptionId();
+        doReturn(mTelephonyManagerForSub).when(mTelephonyManager).createForSubscriptionId(subId);
+        if (level == -1) {
+            when(mTelephonyManagerForSub.getSignalStrength()).thenReturn(null);
+        } else {
+            final SignalStrength signalStrength = mock(SignalStrength.class);
+            doReturn(signalStrength).when(mTelephonyManagerForSub).getSignalStrength();
+            when(signalStrength.getLevel()).thenReturn(level);
+        }
+    }
+
+    private void initializeMethod(boolean isSubscriptionCanBeDisplayed,
+            int defaultSmsSubscriptionId, int defaultVoiceSubscriptionId,
+            int defaultDataSubscriptionId, boolean isActiveCellularNetwork,
+            boolean isProviderModelEnabled) {
+        doReturn(isSubscriptionCanBeDisplayed)
+                .when(sInjector).canSubscriptionBeDisplayed(mContext, eq(anyInt()));
+        doReturn(defaultSmsSubscriptionId).when(sInjector).getDefaultSmsSubscriptionId();
+        doReturn(defaultVoiceSubscriptionId).when(sInjector).getDefaultVoiceSubscriptionId();
+        doReturn(defaultDataSubscriptionId).when(sInjector).getDefaultDataSubscriptionId();
+        doReturn(isActiveCellularNetwork).when(sInjector).isActiveCellularNetwork(mContext);
+        doReturn(isProviderModelEnabled).when(sInjector).isProviderModelEnabled(mContext);
+        doReturn(mock(Drawable.class))
+                .when(sInjector).getIcon(any(), anyInt(), anyInt(), eq(false));
+    }
+
+    private static class FakeSubscriptionsPreferenceController
+            extends SubscriptionsPreferenceController {
+
+        /**
+         * @param context            the context for the UI where we're placing these preferences
+         * @param lifecycle          for listening to lifecycle events for the UI
+         * @param updateListener     called to let our parent controller know that our
+         *                           availability has
+         *                           changed, or that one or more of the preferences we've placed
+         *                           in the
+         *                           PreferenceGroup has changed
+         * @param preferenceGroupKey the key used to lookup the PreferenceGroup where Preferences
+         *                          will
+         *                           be placed
+         * @param startOrder         the order that should be given to the first Preference
+         *                           placed into
+         *                           the PreferenceGroup; the second will use startOrder+1, third
+         *                           will
+         *                           use startOrder+2, etc. - this is useful for when the parent
+         *                           wants
+         *                           to have other preferences in the same PreferenceGroup and wants
+         */
+        FakeSubscriptionsPreferenceController(Context context, Lifecycle lifecycle,
+                UpdateListener updateListener, String preferenceGroupKey, int startOrder) {
+            super(context, lifecycle, updateListener, preferenceGroupKey, startOrder);
+        }
+
+        @Override
+        protected SubsPrefCtrlInjector createSubsPrefCtrlInjector() {
+            return sInjector;
+        }
+    }
+}
diff --git a/tests/unit/src/com/android/settings/panel/PanelFeatureProviderImplTest.java b/tests/unit/src/com/android/settings/panel/PanelFeatureProviderImplTest.java
index 3b61a73..2199023 100644
--- a/tests/unit/src/com/android/settings/panel/PanelFeatureProviderImplTest.java
+++ b/tests/unit/src/com/android/settings/panel/PanelFeatureProviderImplTest.java
@@ -27,7 +27,10 @@
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
+import com.android.settings.testutils.FeatureFlagUtilsRule;
+
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -36,6 +39,9 @@
 
     private static final String TEST_PACKAGENAME = "com.test.packagename";
 
+    @Rule
+    public final FeatureFlagUtilsRule mFeatureFlagUtilsRule = new FeatureFlagUtilsRule();
+
     private Context mContext;
     private PanelFeatureProviderImpl mProvider;
     private Bundle mBundle;
@@ -65,4 +71,24 @@
 
         assertThat(panel).isInstanceOf(VolumePanel.class);
     }
+
+    @Test
+    public void getPanel_wifi_returnsWifiPanelWhenProviderModelDisable() {
+        mFeatureFlagUtilsRule.setProviderModelEnabled(false);
+        mBundle.putString(KEY_PANEL_TYPE_ARGUMENT, Settings.Panel.ACTION_WIFI);
+
+        final PanelContent panel = mProvider.getPanel(mContext, mBundle);
+
+        assertThat(panel).isInstanceOf(WifiPanel.class);
+    }
+
+    @Test
+    public void getPanel_wifi_returnsInternetConnectivityPanelWhenProviderModelDisable() {
+        mFeatureFlagUtilsRule.setProviderModelEnabled(true);
+        mBundle.putString(KEY_PANEL_TYPE_ARGUMENT, Settings.Panel.ACTION_WIFI);
+
+        final PanelContent panel = mProvider.getPanel(mContext, mBundle);
+
+        assertThat(panel).isInstanceOf(InternetConnectivityPanel.class);
+    }
 }
diff --git a/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java
index 47851b9..d20fc12 100644
--- a/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java
+++ b/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java
@@ -41,6 +41,7 @@
 import com.android.settings.security.SecurityFeatureProvider;
 import com.android.settings.slices.SlicesFeatureProvider;
 import com.android.settings.users.UserFeatureProvider;
+import com.android.settings.wifi.WifiTrackerLibProvider;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
 /**
@@ -72,6 +73,8 @@
     public SearchFeatureProvider searchFeatureProvider;
     public ContextualCardFeatureProvider mContextualCardFeatureProvider;
 
+    public WifiTrackerLibProvider wifiTrackerLibProvider;
+
     /**
      * Call this in {@code @Before} method of the test class to use fake factory.
      */
@@ -106,6 +109,7 @@
         mBluetoothFeatureProvider = mock(BluetoothFeatureProvider.class);
         mAwareFeatureProvider = mock(AwareFeatureProvider.class);
         mFaceFeatureProvider = mock(FaceFeatureProvider.class);
+        wifiTrackerLibProvider = mock(WifiTrackerLibProvider.class);
     }
 
     @Override
@@ -217,4 +221,9 @@
     public FaceFeatureProvider getFaceFeatureProvider() {
         return mFaceFeatureProvider;
     }
+
+    @Override
+    public WifiTrackerLibProvider getWifiTrackerLibProvider() {
+        return wifiTrackerLibProvider;
+    }
 }
diff --git a/tests/unit/src/com/android/settings/testutils/FeatureFlagUtilsRule.java b/tests/unit/src/com/android/settings/testutils/FeatureFlagUtilsRule.java
new file mode 100644
index 0000000..910073e
--- /dev/null
+++ b/tests/unit/src/com/android/settings/testutils/FeatureFlagUtilsRule.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2020 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.testutils;
+
+import android.content.Context;
+import android.util.FeatureFlagUtils;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import org.junit.rules.ExternalResource;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A test rule that is used to automatically recover the FeatureFlagUtils resource after testing.
+ *
+ * Example:
+ * <pre class="code"><code class="java">
+ * public class ExampleTest {
+ *
+ *     &#064;Rule
+ *     public final FeatureFlagUtilsRule mFeatureFlagUtilsRule = new FeatureFlagUtilsRule();
+ *
+ * }
+ * </code></pre>
+ */
+public class FeatureFlagUtilsRule extends ExternalResource {
+
+    private Context mContext;
+    private Map<String, Boolean> mBackupFeatureFlags = new HashMap<String, Boolean>();
+
+    @Override
+    protected void before() throws Throwable {
+        mContext = ApplicationProvider.getApplicationContext();
+    }
+
+    @Override
+    protected void after() {
+        mBackupFeatureFlags.forEach((k, v) -> FeatureFlagUtils.setEnabled(mContext, k, v));
+    }
+
+    public void setEnabled(String feature, boolean enabled) {
+        if (enabled == FeatureFlagUtils.isEnabled(mContext, feature)) {
+            return;
+        }
+        mBackupFeatureFlags.putIfAbsent(feature, !enabled);
+        FeatureFlagUtils.setEnabled(mContext, feature, enabled);
+    }
+
+    public void setProviderModelEnabled(boolean enabled) {
+        setEnabled(FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, enabled);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/wifi/WifiPickerTrackerHelperTest.java b/tests/unit/src/com/android/settings/wifi/WifiPickerTrackerHelperTest.java
new file mode 100644
index 0000000..2991550
--- /dev/null
+++ b/tests/unit/src/com/android/settings/wifi/WifiPickerTrackerHelperTest.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2021 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.wifi;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.os.HandlerThread;
+
+import androidx.lifecycle.Lifecycle;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.wifitrackerlib.MergedCarrierEntry;
+import com.android.wifitrackerlib.WifiEntry;
+import com.android.wifitrackerlib.WifiPickerTracker;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+
+@RunWith(AndroidJUnit4.class)
+public class WifiPickerTrackerHelperTest {
+
+    @Rule
+    public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+    @Mock
+    public WifiPickerTracker mWifiPickerTracker;
+    @Mock
+    public MergedCarrierEntry mMergedCarrierEntry;
+    @Mock
+    public WifiEntry.ConnectCallback mConnectCallback;
+
+    private WifiPickerTrackerHelper mWifiPickerTrackerHelper;
+
+    private FakeFeatureFactory mFeatureFactory;
+
+    @Before
+    public void setUp() {
+        mFeatureFactory = FakeFeatureFactory.setupForTest();
+        when(mFeatureFactory.wifiTrackerLibProvider
+                .createWifiPickerTracker(
+                        any(), any(), any(), any(), any(), anyLong(), anyLong(), any()))
+                .thenReturn(mWifiPickerTracker);
+        mWifiPickerTrackerHelper = new WifiPickerTrackerHelper(mock(Lifecycle.class),
+                ApplicationProvider.getApplicationContext(), null);
+    }
+
+    @Test
+    public void getWifiPickerTracker_returnNonNull() {
+        assertThat(mWifiPickerTrackerHelper.getWifiPickerTracker()).isNotNull();
+    }
+
+    @Test
+    public void onDestroy_workerThreadQuit() {
+        final HandlerThread workerThread = mock(HandlerThread.class);
+        mWifiPickerTrackerHelper.setWorkerThread(workerThread);
+
+        mWifiPickerTrackerHelper.onDestroy();
+
+        verify(workerThread).quit();
+    }
+
+    @Test
+    public void setCarrierNetworkEnabled_returnTrueAndSetEnabled() {
+        mWifiPickerTrackerHelper.setWifiPickerTracker(mWifiPickerTracker);
+        when(mWifiPickerTracker.getMergedCarrierEntry()).thenReturn(mMergedCarrierEntry);
+
+        assertThat(mWifiPickerTrackerHelper.setCarrierNetworkEnabled(true)).isTrue();
+        verify(mMergedCarrierEntry).setEnabled(true);
+
+        assertThat(mWifiPickerTrackerHelper.setCarrierNetworkEnabled(false)).isTrue();
+        verify(mMergedCarrierEntry).setEnabled(false);
+    }
+
+    @Test
+    public void setCarrierNetworkEnabled_mergedCarrierEntryIsNull_returnFalse() {
+        mWifiPickerTrackerHelper.setWifiPickerTracker(mWifiPickerTracker);
+        when(mWifiPickerTracker.getMergedCarrierEntry()).thenReturn(null);
+
+        assertThat(mWifiPickerTrackerHelper.setCarrierNetworkEnabled(true)).isFalse();
+        assertThat(mWifiPickerTrackerHelper.setCarrierNetworkEnabled(false)).isFalse();
+    }
+
+    @Test
+    public void connectCarrierNetwork_returnTrueAndConnect() {
+        mWifiPickerTrackerHelper.setWifiPickerTracker(mWifiPickerTracker);
+        when(mWifiPickerTracker.getMergedCarrierEntry()).thenReturn(mMergedCarrierEntry);
+        when(mMergedCarrierEntry.canConnect()).thenReturn(true);
+
+        assertThat(mWifiPickerTrackerHelper.connectCarrierNetwork(mConnectCallback)).isTrue();
+        verify(mMergedCarrierEntry).connect(mConnectCallback);
+    }
+
+    @Test
+    public void connectCarrierNetwork_mergedCarrierEntryIsNull_returnFalse() {
+        mWifiPickerTrackerHelper.setWifiPickerTracker(mWifiPickerTracker);
+        when(mWifiPickerTracker.getMergedCarrierEntry()).thenReturn(null);
+
+        assertThat(mWifiPickerTrackerHelper.connectCarrierNetwork(mConnectCallback)).isFalse();
+    }
+
+    @Test
+    public void connectCarrierNetwork_canConnectIsFalse_returnFalseAndNeverConnect() {
+        mWifiPickerTrackerHelper.setWifiPickerTracker(mWifiPickerTracker);
+        when(mWifiPickerTracker.getMergedCarrierEntry()).thenReturn(mMergedCarrierEntry);
+        when(mMergedCarrierEntry.canConnect()).thenReturn(false);
+
+        assertThat(mWifiPickerTrackerHelper.connectCarrierNetwork(mConnectCallback)).isFalse();
+        verify(mMergedCarrierEntry, never()).connect(mConnectCallback);
+    }
+}