Merge "Removes the A11y tutorial that displays on change to gesture navigation" into main
diff --git a/Android.bp b/Android.bp
index 28c3148..8f7bd1b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -98,6 +98,7 @@
         "SettingsLibDataStore",
         "SettingsLibMetadata",
         "SettingsLibPreference",
+        "SettingsLibService",
         "aconfig_settings_flags_lib",
         "accessibility_settings_flags_lib",
         "contextualcards",
@@ -107,7 +108,6 @@
         "fuelgauge-protos-lite",
         "settings-logtags",
         "statslog-settings",
-        "telephony_flags_core_java_lib",
         "setupdesign-lottie-loading-layout",
         "device_policy_aconfig_flags_lib",
         "keyboard_flags_lib",
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6408ab1..11d9779 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -5293,12 +5293,36 @@
                 android:value="com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamConfirmDialog" />
         </activity>
 
+        <activity
+            android:name="Settings$ContactsStorageSettingsActivity"
+            android:label="@string/contacts_storage_settings_title"
+            android:exported="true"
+            android:featureFlag="com.android.settings.flags.enable_contacts_default_account_in_settings">
+            <intent-filter>
+                <action android:name="android.provider.action.SET_DEFAULT_ACCOUNT" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.applications.contacts.ContactsStorageSettings"/>
+        </activity>
+
         <service
             android:name="com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamMediaService"
             android:foregroundServiceType="mediaPlayback"
             android:enabled="true"
             android:exported="false" />
 
+        <!-- Once b/364771256 is fixed, add android:featureFlag="com.android.settings.flags.catalyst_service". -->
+        <!-- Permission is not yet finalized, use READ_BASIC_PHONE_STATE temporarily. -->
+        <service
+            android:name=".SettingsService"
+            android:exported="true"
+            android:permission="android.permission.READ_BASIC_PHONE_STATE">
+            <intent-filter>
+                <action android:name="com.android.settingslib.PREFERENCE_SERVICE" />
+            </intent-filter>
+        </service>
+
         <receiver android:name="com.android.settings.connecteddevice.audiosharing.AudioSharingReceiver"
             android:exported="false">
             <intent-filter>
diff --git a/aconfig/catalyst/accessibility.aconfig b/aconfig/catalyst/accessibility.aconfig
new file mode 100644
index 0000000..7837067
--- /dev/null
+++ b/aconfig/catalyst/accessibility.aconfig
@@ -0,0 +1,16 @@
+package: "com.android.settings.flags"
+container: "system"
+
+flag {
+  name: "catalyst_accessibility_color_and_motion"
+  namespace: "android_settings"
+  description: "Migrate Color and motion screen to the Catalyst infrastructure"
+  bug: "323791114"
+}
+
+flag {
+  name: "catalyst_text_reading_screen"
+  namespace: "android_settings"
+  description: "Flag for Display size and text"
+  bug: "323791114"
+}
diff --git a/aconfig/catalyst/battery.aconfig b/aconfig/catalyst/battery.aconfig
new file mode 100644
index 0000000..cec40f3
--- /dev/null
+++ b/aconfig/catalyst/battery.aconfig
@@ -0,0 +1,16 @@
+package: "com.android.settings.flags"
+container: "system"
+
+flag {
+  name: "catalyst_power_usage_summary_screen"
+  namespace: "android_settings"
+  description: "Flag for Battery screen"
+  bug: "323791114"
+}
+
+flag {
+  name: "catalyst_battery_saver_screen"
+  namespace: "android_settings"
+  description: "Flag for Battery Saver"
+  bug: "323791114"
+}
\ No newline at end of file
diff --git a/aconfig/catalyst/connected_devices.aconfig b/aconfig/catalyst/connected_devices.aconfig
new file mode 100644
index 0000000..7a335fa
--- /dev/null
+++ b/aconfig/catalyst/connected_devices.aconfig
@@ -0,0 +1,9 @@
+package: "com.android.settings.flags"
+container: "system"
+
+flag {
+  name: "catalyst_bluetooth_switchbar_screen"
+  namespace: "android_settings"
+  description: "Flag for Bluetooth"
+  bug: "323791114"
+}
diff --git a/aconfig/catalyst/display.aconfig b/aconfig/catalyst/display.aconfig
index f722f74..94a01e0 100644
--- a/aconfig/catalyst/display.aconfig
+++ b/aconfig/catalyst/display.aconfig
@@ -7,3 +7,10 @@
   description: "Flag for Display"
   bug: "323791114"
 }
+
+flag {
+  name: "catalyst_screen_timeout"
+  namespace: "android_settings"
+  description: "Flag for Screen Timeout settings"
+  bug: "323791114"
+}
diff --git a/aconfig/catalyst/location.aconfig b/aconfig/catalyst/location.aconfig
new file mode 100644
index 0000000..c656bf3
--- /dev/null
+++ b/aconfig/catalyst/location.aconfig
@@ -0,0 +1,9 @@
+package: "com.android.settings.flags"
+container: "system"
+
+flag {
+  name: "catalyst_location_settings"
+  namespace: "android_settings"
+  description: "Flag for Location"
+  bug: "323791114"
+}
diff --git a/aconfig/catalyst/network_and_internet.aconfig b/aconfig/catalyst/network_and_internet.aconfig
new file mode 100644
index 0000000..a5183f3
--- /dev/null
+++ b/aconfig/catalyst/network_and_internet.aconfig
@@ -0,0 +1,16 @@
+package: "com.android.settings.flags"
+container: "system"
+
+flag {
+  name: "catalyst_network_provider_and_internet_screen"
+  namespace: "android_settings"
+  description: "Flag for Network & Internet"
+  bug: "323791114"
+}
+
+flag {
+  name: "catalyst_mobile_network_list"
+  namespace: "android_settings"
+  description: "Flag for SIMs"
+  bug: "323791114"
+}
diff --git a/aconfig/catalyst/sound_screen.aconfig b/aconfig/catalyst/sound_screen.aconfig
index ea5f771..ac7f8bc 100644
--- a/aconfig/catalyst/sound_screen.aconfig
+++ b/aconfig/catalyst/sound_screen.aconfig
@@ -6,4 +6,11 @@
     namespace: "android_settings"
     description: "Flag for sound and vibration page"
     bug: "323791114"
+}
+
+flag {
+    name: "catalyst_vibration_intensity_screen"
+    namespace: "android_settings"
+    description: "Flag for vibration and haptics page"
+    bug: "323791114"
 }
\ No newline at end of file
diff --git a/aconfig/settings_flag_declarations.aconfig b/aconfig/settings_flag_declarations.aconfig
index a9c7bd5..6eb1e02 100644
--- a/aconfig/settings_flag_declarations.aconfig
+++ b/aconfig/settings_flag_declarations.aconfig
@@ -63,3 +63,10 @@
   description: "Flag for all screens"
   bug: "323791114"
 }
+
+flag {
+  name: "catalyst_service"
+  namespace: "android_settings"
+  description: "Flag for catalyst service"
+  bug: "323791114"
+}
diff --git a/res-product/values-it/strings.xml b/res-product/values-it/strings.xml
index f0dddcf..a9dbcf6 100644
--- a/res-product/values-it/strings.xml
+++ b/res-product/values-it/strings.xml
@@ -338,13 +338,13 @@
     <string name="no_5g_in_dsds_text" product="device" msgid="2081735896122371350">"Se vengono usate due SIM, questo dispositivo può usare soltanto la rete 4G. "<annotation id="url">"Ulteriori informazioni"</annotation></string>
     <string name="reset_internet_text" product="default" msgid="8672305377652449075">"La telefonata verrà terminata"</string>
     <string name="reset_internet_text" product="tablet" msgid="8672305377652449075">"La telefonata verrà terminata"</string>
-    <string name="lockpassword_confirm_your_pattern_details_frp" product="default" msgid="8795084788352126815">"Impostazioni di fabbrica ripristinate. Per usare il telefono, inserisci la sequenza precedente."</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" product="default" msgid="8795084788352126815">"Impostazioni di fabbrica ripristinate. Per usare lo smartphone, inserisci la sequenza precedente."</string>
     <string name="lockpassword_confirm_your_pattern_details_frp" product="tablet" msgid="1816846183732787701">"Impostazioni di fabbrica ripristinate. Per usare il tablet, inserisci la sequenza precedente."</string>
     <string name="lockpassword_confirm_your_pattern_details_frp" product="device" msgid="7897925268003690167">"Impostazioni di fabbrica ripristinate. Per usare il dispositivo, inserisci la sequenza precedente."</string>
-    <string name="lockpassword_confirm_your_pin_details_frp" product="default" msgid="2027547169650312092">"Impostazioni di fabbrica ripristinate. Per usare il telefono, inserisci il PIN precedente."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" product="default" msgid="2027547169650312092">"Impostazioni di fabbrica ripristinate. Per usare lo smartphone, inserisci il PIN precedente."</string>
     <string name="lockpassword_confirm_your_pin_details_frp" product="tablet" msgid="8264086895022779707">"Impostazioni di fabbrica ripristinate. Per usare il tablet, inserisci il PIN precedente."</string>
     <string name="lockpassword_confirm_your_pin_details_frp" product="device" msgid="1654340132011802578">"Impostazioni di fabbrica ripristinate. Per usare il dispositivo, inserisci il PIN precedente."</string>
-    <string name="lockpassword_confirm_your_password_details_frp" product="default" msgid="1465326741724776281">"Impostazioni di fabbrica ripristinate. Per usare il telefono, inserisci la password precedente."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" product="default" msgid="1465326741724776281">"Impostazioni di fabbrica ripristinate. Per usare lo smartphone, inserisci la password precedente."</string>
     <string name="lockpassword_confirm_your_password_details_frp" product="tablet" msgid="1333164951750797865">"Impostazioni di fabbrica ripristinate. Per usare il tablet, inserisci la password precedente."</string>
     <string name="lockpassword_confirm_your_password_details_frp" product="device" msgid="116667646012224967">"Impostazioni di fabbrica ripristinate. Per usare il dispositivo, inserisci la password precedente."</string>
     <string name="battery_tip_incompatible_charging_message" product="default" msgid="5097154279720383707">"Lo smartphone potrebbe ricaricarsi lentamente o non ricaricarsi affatto. Per velocizzare la ricarica, usa un cavo e un alimentatore consigliati."</string>
diff --git a/res-product/values-pt-rBR/strings.xml b/res-product/values-pt-rBR/strings.xml
index e5b8d4c..2db3469 100644
--- a/res-product/values-pt-rBR/strings.xml
+++ b/res-product/values-pt-rBR/strings.xml
@@ -106,7 +106,7 @@
     <string name="security_settings_face_settings_footer_class3_attention_not_supported" product="default" msgid="5512898803063743303">"Use seu rosto para desbloquear o smartphone, fazer fazer login em apps ou finalizar compras.\n\nNão se esqueça:\nSó é possível configurar um rosto por vez. Para adicionar outro rosto, exclua o registrado atualmente.\n\nOlhar para o smartphone pode desbloquear o dispositivo, mesmo sem intenção.\n\nEle pode ser desbloqueado por outra pessoa se ele for apontado para seu rosto, mesmo que você esteja com os olhos fechados.\n\nO desbloqueio também pode ser feito por alguém que se pareça muito com você, como um gêmeo idêntico."</string>
     <string name="security_settings_face_settings_footer_class3_attention_not_supported" product="tablet" msgid="6790505667764631343">"Use seu rosto para desbloquear o tablet, fazer login em apps ou finalizar compras.\n\nNão se esqueça:\nSó é possível configurar um rosto por vez. Para adicionar outro rosto, exclua o registrado atualmente.\n\nOlhar para o tablet pode desbloquear o dispositivo, mesmo sem intenção.\n\nEle pode ser desbloqueado por outra pessoa se for direcionado para seu rosto, mesmo que você esteja de olhos fechados.\n\nTambém pode ser desbloqueado por alguém que se pareça muito com você, como, por exemplo, um gêmeo idêntico."</string>
     <string name="security_settings_face_settings_footer_class3_attention_not_supported" product="device" msgid="7858917821957779752">"Use seu rosto para desbloquear o dispositivo ou confirmar sua identidade, fazer login ou finalizar compras.\n\nNão se esqueça:\nSó é possível configurar um rosto por vez. Para adicionar outro, exclua o registrado atualmente.\n\nOlhar para o dispositivo pode desbloquear mesmo sem intenção.\n\nEle pode ser desbloqueado por outra pessoa se for direcionado para seu rosto, mesmo com os olhos fechados.\n\nO desbloqueio também pode ser feito por alguém que se pareça muito com você, como um gêmeo idêntico."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_v3_message" msgid="2145273491174234191">"Use sua impressão digital para desbloquear o dispositivo <xliff:g id="DEVICENAME">%s</xliff:g> ou confirmar sua identidade e acessar apps ou aprovar uma compra"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_v3_message" msgid="2145273491174234191">"Use sua impressão digital para desbloquear o dispositivo <xliff:g id="DEVICENAME">%s</xliff:g> ou confirmar sua identidade, como ao acessar apps ou aprovar uma compra"</string>
     <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="default" msgid="5101253231118659496">"Permita que a criança use a impressão digital para desbloquear o smartphone ou confirmar a identidade dela. Isso acontece quando ela faz login em apps, aprova uma compra, entre outras ocasiões."</string>
     <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="tablet" msgid="3063978167545799342">"Permita que a criança use a impressão digital para desbloquear o tablet ou confirmar a identidade dela. Isso acontece quando ela faz login em apps, aprova uma compra, entre outras ocasiões."</string>
     <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="device" msgid="4399560001732497632">"Permita que a criança use a impressão digital para desbloquear o dispositivo ou confirmar a identidade dela. Isso acontece quando ela faz login em apps, aprova uma compra, entre outras ocasiões."</string>
diff --git a/res-product/values-pt/strings.xml b/res-product/values-pt/strings.xml
index e5b8d4c..2db3469 100644
--- a/res-product/values-pt/strings.xml
+++ b/res-product/values-pt/strings.xml
@@ -106,7 +106,7 @@
     <string name="security_settings_face_settings_footer_class3_attention_not_supported" product="default" msgid="5512898803063743303">"Use seu rosto para desbloquear o smartphone, fazer fazer login em apps ou finalizar compras.\n\nNão se esqueça:\nSó é possível configurar um rosto por vez. Para adicionar outro rosto, exclua o registrado atualmente.\n\nOlhar para o smartphone pode desbloquear o dispositivo, mesmo sem intenção.\n\nEle pode ser desbloqueado por outra pessoa se ele for apontado para seu rosto, mesmo que você esteja com os olhos fechados.\n\nO desbloqueio também pode ser feito por alguém que se pareça muito com você, como um gêmeo idêntico."</string>
     <string name="security_settings_face_settings_footer_class3_attention_not_supported" product="tablet" msgid="6790505667764631343">"Use seu rosto para desbloquear o tablet, fazer login em apps ou finalizar compras.\n\nNão se esqueça:\nSó é possível configurar um rosto por vez. Para adicionar outro rosto, exclua o registrado atualmente.\n\nOlhar para o tablet pode desbloquear o dispositivo, mesmo sem intenção.\n\nEle pode ser desbloqueado por outra pessoa se for direcionado para seu rosto, mesmo que você esteja de olhos fechados.\n\nTambém pode ser desbloqueado por alguém que se pareça muito com você, como, por exemplo, um gêmeo idêntico."</string>
     <string name="security_settings_face_settings_footer_class3_attention_not_supported" product="device" msgid="7858917821957779752">"Use seu rosto para desbloquear o dispositivo ou confirmar sua identidade, fazer login ou finalizar compras.\n\nNão se esqueça:\nSó é possível configurar um rosto por vez. Para adicionar outro, exclua o registrado atualmente.\n\nOlhar para o dispositivo pode desbloquear mesmo sem intenção.\n\nEle pode ser desbloqueado por outra pessoa se for direcionado para seu rosto, mesmo com os olhos fechados.\n\nO desbloqueio também pode ser feito por alguém que se pareça muito com você, como um gêmeo idêntico."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_v3_message" msgid="2145273491174234191">"Use sua impressão digital para desbloquear o dispositivo <xliff:g id="DEVICENAME">%s</xliff:g> ou confirmar sua identidade e acessar apps ou aprovar uma compra"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_v3_message" msgid="2145273491174234191">"Use sua impressão digital para desbloquear o dispositivo <xliff:g id="DEVICENAME">%s</xliff:g> ou confirmar sua identidade, como ao acessar apps ou aprovar uma compra"</string>
     <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="default" msgid="5101253231118659496">"Permita que a criança use a impressão digital para desbloquear o smartphone ou confirmar a identidade dela. Isso acontece quando ela faz login em apps, aprova uma compra, entre outras ocasiões."</string>
     <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="tablet" msgid="3063978167545799342">"Permita que a criança use a impressão digital para desbloquear o tablet ou confirmar a identidade dela. Isso acontece quando ela faz login em apps, aprova uma compra, entre outras ocasiões."</string>
     <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="device" msgid="4399560001732497632">"Permita que a criança use a impressão digital para desbloquear o dispositivo ou confirmar a identidade dela. Isso acontece quando ela faz login em apps, aprova uma compra, entre outras ocasiões."</string>
diff --git a/res/drawable/accessibility_contrast_button_background.xml b/res/drawable/accessibility_contrast_button_background.xml
index 281fcef..7e41aae 100644
--- a/res/drawable/accessibility_contrast_button_background.xml
+++ b/res/drawable/accessibility_contrast_button_background.xml
@@ -32,7 +32,7 @@
             <item
                 android:width="24dp"
                 android:height="24dp"
-                android:left="57dp"
+                android:start="57dp"
                 android:top="57dp">
                 <vector
                     android:width="24dp"
diff --git a/res/layout/dialog_a11y_bounce_key.xml b/res/layout/dialog_keyboard_a11y_input_setting_keys.xml
similarity index 80%
rename from res/layout/dialog_a11y_bounce_key.xml
rename to res/layout/dialog_keyboard_a11y_input_setting_keys.xml
index da3ebde..dfa3c46 100644
--- a/res/layout/dialog_a11y_bounce_key.xml
+++ b/res/layout/dialog_keyboard_a11y_input_setting_keys.xml
@@ -22,47 +22,45 @@
               android:orientation="vertical">
 
     <TextView
-        android:id="@+id/bounce_key_dialog_title"
+        android:id="@+id/input_setting_keys_dialog_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:textSize="20sp"
         android:gravity="center_horizontal"
-        android:text="@string/bounce_keys_dialog_title"
         android:textColor="?android:attr/textColorPrimary"
         android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
     />
 
     <TextView
-        android:id="@+id/bounce_key_dialog_subtitle"
+        android:id="@+id/input_setting_keys_dialog_subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="26dp"
         android:layout_marginTop="8dp"
         android:textSize="16sp"
         android:gravity="center"
-        android:text="@string/bounce_keys_dialog_subtitle"
         android:textColor="?android:attr/textColorSecondary"
     />
 
     <RadioGroup
-        android:id="@+id/bounce_key_value_group"
+        android:id="@+id/input_setting_keys_value_group"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
         android:layout_marginTop="16dp">
 
         <RadioButton
-            android:id="@+id/bounce_key_value_200"
-            android:text="@string/bounce_keys_dialog_option_200"
+            android:id="@+id/input_setting_keys_value_200"
+            android:text="@string/input_setting_keys_dialog_option_200"
             android:paddingStart="12dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="start|center_vertical"
             android:background="@null"/>
         <RadioButton
-            android:id="@+id/bounce_key_value_400"
-            android:text="@string/bounce_keys_dialog_option_400"
+            android:id="@+id/input_setting_keys_value_400"
+            android:text="@string/input_setting_keys_dialog_option_400"
             android:paddingStart="12dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -70,8 +68,8 @@
             android:layout_marginTop="12dp"
             android:background="@null"/>
         <RadioButton
-            android:id="@+id/bounce_key_value_600"
-            android:text="@string/bounce_keys_dialog_option_600"
+            android:id="@+id/input_setting_keys_value_600"
+            android:text="@string/input_setting_keys_dialog_option_600"
             android:paddingStart="12dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -85,14 +83,14 @@
             android:layout_height="wrap_content"
             android:layout_marginVertical="12dp">
             <RadioButton
-                android:id="@+id/bounce_key_value_custom"
+                android:id="@+id/input_setting_keys_value_custom"
                 android:paddingStart="12dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:background="@null"/>
             <LinearLayout
-                android:id="@+id/custom_value_option"
+                android:id="@+id/input_setting_keys_custom_value_option"
                 android:orientation="vertical"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -100,15 +98,15 @@
                 android:gravity="center_vertical"
                 android:paddingEnd="16dp">
                 <TextView
-                    android:id="@+id/bounce_key_value_custom_title"
-                    android:text="Custom"
+                    android:id="@+id/input_setting_keys_value_custom_title"
+                    android:text="@string/input_setting_keys_custom_title"
                     android:textColor="?android:attr/textColorPrimary"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"/>
                 <TextView
-                    android:id="@+id/bounce_key_value_custom_value"
-                    android:text="custom value"
+                    android:id="@+id/input_setting_keys_value_custom_value"
+                    android:text="@string/input_setting_keys_custom_value"
                     android:textColor="?android:attr/textColorPrimary"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -116,7 +114,7 @@
                     android:layout_marginTop="8dp"
                     android:visibility="gone"/>
                 <SeekBar
-                    android:id="@+id/bounce_key_value_custom_slider"
+                    android:id="@+id/input_setting_keys_value_custom_slider"
                     android:paddingStart="8dp"
                     android:paddingEnd="36dp"
                     android:min="1"
diff --git a/res/layout/preference_credential_manager_with_buttons.xml b/res/layout/preference_credential_manager_with_buttons.xml
index 24096f7..e27bd50 100644
--- a/res/layout/preference_credential_manager_with_buttons.xml
+++ b/res/layout/preference_credential_manager_with_buttons.xml
@@ -18,6 +18,7 @@
 <!-- Based off preference_single_target.xml with buttons added below text. -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -95,18 +96,29 @@
         android:gravity="center"
         android:orientation="vertical" />
 
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/credman_button_frame"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="start|center_vertical"
         android:minWidth="56dp"
-        android:orientation="horizontal"
         android:clipToPadding="false"
         android:paddingTop="4dp"
         android:paddingLeft="76dp"
         android:paddingBottom="4dp">
 
+        <androidx.constraintlayout.helper.widget.Flow
+            android:id="@+id/button_flow"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:constraint_referenced_ids="change_button, open_button"
+            app:flow_horizontalStyle="spread_inside"
+            app:flow_wrapMode="chain"
+            app:flow_verticalGap = "16dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
             <Button
                 android:id="@+id/change_button"
                 android:layout_width="match_parent"
@@ -122,6 +134,6 @@
                 android:visibility="gone"
                 android:text="@string/credman_button_open"/>
 
-    </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index 4b51726..8d5d24e 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Aktetas"</item>
-    <item msgid="184985872234062767">"Klassieke gebou"</item>
-    <item msgid="9189550412466785530">"Woonstelblok"</item>
-    <item msgid="2142527562511049422">"Spraakborrel"</item>
-    <item msgid="2548100558260478605">"Groep mense"</item>
-    <item msgid="2270003903304578284">"Gloeilamp"</item>
-    <item msgid="4793496619091161864">"Kalender"</item>
-    <item msgid="5673625795644364100">"Moenie Steur Nie"</item>
-    <item msgid="1423820834865831361">"Mens wat hardloop"</item>
-    <item msgid="2037298830718732608">"Gholf"</item>
-    <item msgid="2197835014443491074">"Gimnasiumhandgewig"</item>
-    <item msgid="2730180105015616518">"Swem"</item>
-    <item msgid="2666922823253345958">"Mens wat voetslaan"</item>
-    <item msgid="8234880356472211396">"Mens wat ’n bal gooi"</item>
-    <item msgid="4642980625253001443">"Mens wat skop"</item>
-    <item msgid="4324795269518833500">"Speletjiebeheerder"</item>
-    <item msgid="7789966425125441125">"Kunstenaar se kleurpalet"</item>
-    <item msgid="663512680597461570">"Sneeuvlokkie"</item>
-    <item msgid="7952183800501346803">"Strandsambreel"</item>
-    <item msgid="799139025758265891">"Werkswinkelgereedskap"</item>
-    <item msgid="1330084588359129896">"Tent"</item>
-    <item msgid="3861584909935022342">"Filmspoel"</item>
-    <item msgid="5827426100157335512">"Boek"</item>
-    <item msgid="8585828346253128384">"Egiptiese waterlelie"</item>
-    <item msgid="8788370542815300188">"Mens se gedagtes"</item>
-    <item msgid="7287354964767553293">"Oorfone"</item>
-    <item msgid="2530059623783800987">"TV"</item>
-    <item msgid="5307182323469376758">"Trein"</item>
-    <item msgid="4903790544026923026">"Motor"</item>
-    <item msgid="5010405583912314582">"Mes en vurk"</item>
-    <item msgid="8939998598599064900">"Inkopiemandjie"</item>
-    <item msgid="3379605903308731893">"Kind"</item>
-    <item msgid="7808668968550293112">"Dier se poot"</item>
-    <item msgid="1000692647524056504">"Sterkenteken"</item>
-    <item msgid="8270261073421676502">"Twee mense"</item>
-    <item msgid="5767782819651505460">"Ster"</item>
-    <item msgid="4368451291862729334">"Hartjie"</item>
-    <item msgid="2613199102208419986">"Huis"</item>
-    <item msgid="3022279986430275040">"Halfmaan"</item>
-    <item msgid="5421089790869483206">"Horlosie"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 56a239f..c79bfef 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Stel outomaties deur jou netwerk- en draadloosinstellings"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Outomatiese tydsone"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Stel outomaties op grond van mobiele netwerke naby jou"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Stel outomaties met jou toestelligging, indien beskikbaar. ’n Aktiewe wi-fi-verbinding kan vereis word."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Gebruik verstek vir locale"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Gebruik 24-uur-formaat"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Tyd"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Toeganklikheid"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Fisiese sleutelbord"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Hopsleutels"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Die sleutelbord ignoreer vinnig herhaalde drukke van dieselfde sleutel"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Bonssleuteldrempel"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Kies vir hoe lank jou sleutelbord herhaalde sleuteldrukke ignoreer"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2s."</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4s."</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0,6s."</string>
     <string name="slow_keys" msgid="2891452895499690837">"Stadige sleutels"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Verstel die tyd wat dit neem vir ’n sleuteldruk om geaktiveer te word"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Taaisleutels"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Druk een sleutel op ’n slag vir kortpaaie pleks van om die sleutels saam in te hou"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Muissleutels"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Gebruik jou sleutelbord om die wyser te beheer"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Muis – omgekeerde rollees"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Rollees op om die bladsy af te beweeg"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Ruil linker- en regterknoppies om"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Gebruik die muis se linkerknoppie as jou regterknoppie"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Kortpadsleutels"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Wys lys met kortpaaie"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Werkprofielsleutelborde en -nutsgoed"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Kies ’n nuwe sleutel vir <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Toeganklikheid vir fisieke sleutelbord"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Taaisleutels, hopsleutels, muissleutels"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g>-uitleg"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Verstek"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Voorskou"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standaardopsies"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Taal"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Onderskrifgrootte"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Onderskrifstyl"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Gepasmaakte opsies"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Agtergrondkleur"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Ontkoppel hierdie VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Ontkoppel"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Weergawe"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Vergeet VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Vervang bestaande VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Stel altyd-aan VPN?"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Soekinstellings"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"kontakte, berging, rekening"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Kontakte-berging"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Net toestel"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Nuwe kontakte sal nie met ’n rekening gesinkroniseer word nie"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kontakte sal by verstek op jou toestel gestoor en met jou rekening gesinkroniseer word"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Geen verstek gestel nie"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Voeg ’n rekening by om te begin"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index f2996ac..c088b47 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"የሥራ ቦርሳ"</item>
-    <item msgid="184985872234062767">"የታወቀ ህንፃ"</item>
-    <item msgid="9189550412466785530">"የአፓርታማ ህንፃ"</item>
-    <item msgid="2142527562511049422">"የንግግር ምልክት"</item>
-    <item msgid="2548100558260478605">"የሰዎች ቡድን"</item>
-    <item msgid="2270003903304578284">"አምፖል"</item>
-    <item msgid="4793496619091161864">"ቀን መቁጠሪያ"</item>
-    <item msgid="5673625795644364100">"አትረብሽ"</item>
-    <item msgid="1423820834865831361">"እየሮጠ ያለ ሰው"</item>
-    <item msgid="2037298830718732608">"ጎልፍ"</item>
-    <item msgid="2197835014443491074">"የጂም ዳምቤል"</item>
-    <item msgid="2730180105015616518">"ዋና"</item>
-    <item msgid="2666922823253345958">"ተራራ የሚወጣ ሰው"</item>
-    <item msgid="8234880356472211396">"ኳስ የሚወረውር ሰው"</item>
-    <item msgid="4642980625253001443">"እየመታ ያለ ሰው"</item>
-    <item msgid="4324795269518833500">"የጨዋታ መቆጣጠሪያ"</item>
-    <item msgid="7789966425125441125">"የአርቲስት የቀለም ቤተ ስዕል"</item>
-    <item msgid="663512680597461570">"የበረዶ ቅንጣት"</item>
-    <item msgid="7952183800501346803">"የባህር ዳርቻ ዣንጥላ"</item>
-    <item msgid="799139025758265891">"የሥራ ቦታ መሣሪያዎች"</item>
-    <item msgid="1330084588359129896">"ድንኳን"</item>
-    <item msgid="3861584909935022342">"የፊልም ሪል"</item>
-    <item msgid="5827426100157335512">"መጽሐፍ"</item>
-    <item msgid="8585828346253128384">"የሎተስ አበባ"</item>
-    <item msgid="8788370542815300188">"የሰው አዕምሮ"</item>
-    <item msgid="7287354964767553293">"የራስ ላይ ማዳመጫዎች"</item>
-    <item msgid="2530059623783800987">"ቲቪ"</item>
-    <item msgid="5307182323469376758">"ባቡር"</item>
-    <item msgid="4903790544026923026">"መኪና"</item>
-    <item msgid="5010405583912314582">"ሹካ እና ማንኪያ"</item>
-    <item msgid="8939998598599064900">"የሸመታ ተሳቢ"</item>
-    <item msgid="3379605903308731893">"ልጅ"</item>
-    <item msgid="7808668968550293112">"የእንስሳት መዳፍ"</item>
-    <item msgid="1000692647524056504">"የኮከብ ባጅ"</item>
-    <item msgid="8270261073421676502">"ሁለት ሰዎች"</item>
-    <item msgid="5767782819651505460">"ኮከብ"</item>
-    <item msgid="4368451291862729334">"ልብ"</item>
-    <item msgid="2613199102208419986">"ቤት"</item>
-    <item msgid="3022279986430275040">"ግማሽ ጨረቃ"</item>
-    <item msgid="5421089790869483206">"ሰዓት"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index fd47a2c..36ea8b6 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"አውታረ መረቡን እና ገመድ አልባ ምልክቶችን በመጠቀም በራስ-ሰር ያቀናብሩ"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"ራስ-ሰር የሰዓት ሰቅ"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"በአቅራቢያዎ ባሉ የተንቀሳቃሽ ስልክ አውታረ መረቦች መሰረት በራስ-ሰር ያቀናብሩ"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"የሚገኝ ከሆነ የመሣሪያዎን አካባቢ በመጠቀም በራስ-ሰር ያቀናብሩ። እንዲሁም ንቁ የWifi ግንኙነት ሊያስፈልግ ይችላል።"</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"የቋንቋ ነባሪ ይጠቀሙ"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24 ሰዓት ቅርፀት ተጠቀም"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"ሰዓት"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"ተደራሽነት"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"አካላዊ ቁልፍ ሰሌዳ"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"የመንጠሪያ ቁልፎች"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"ቁልፍ ሰሌዳው ተመሳሳዩ ቁልፍ በፍጥነት መጫኖችን ችላ ይላል"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"የወጡ ቁልፎች መባቻ"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"የቁልፍ ሰሌዳዎ ተደጋጋሚ የቁልፍ መጫኖችን ችላ የሚልበትን የቆይታ ጊዜ ይምረጡ"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0.2ሰ"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0.4ሰ"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0.6ሰ"</string>
     <string name="slow_keys" msgid="2891452895499690837">"ቀርፋፋ ቁልፎች"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"የቁልፍ መጫኖችን ለማግበር የሚወስደውን ጊዜ ያስተካክላል"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"ተጣባቂ ቁልፎች"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"አቋራጮችን ለማግኘት ቁልፎችን በአንድ ላይ ከመያዝ ይልቅ ቁልፎችን አንድ በአንድ ይጫኑ"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"የመዳፊት ቁልፎች"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"ነጥቦቹን ለመቆጣጠር የቁልፍ ሰሌዳዎን ይጠቀሙ"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"የመዳፊት ወደኋላ መሸብለል"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"ገፁን ወደ ታች ለማንቀሳቀስ ወደ ላይ ይሸብልሉ"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"የግራ እና የቀኝ አዝራሮችን ያለዋውጡ"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"የግራ የመዳፊት አዝራሩን እንደ የእርስዎ ቀኝ ይጠቀሙ"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"የቁልፍ ሰሌዳ አቋራጮች"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"የአቋራጭ ዝርዝርን አሳይ"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"የሥራ መገለጫ የቁልፍ ሰሌዳዎች እና መሣሪያዎች"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"ለ<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> አዲስ ቁልፍ ይምረጡ፦"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"የአካላዊ ቁልፍ ሰሌዳ ተደራሽነት"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"ተለጣፊ ቁልፎች፣ አንጥር ቁልፎች፣ የመዳፊት ቁልፎች"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"የ<xliff:g id="IME_LABEL">%s</xliff:g> አቀማመጥ"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ነባሪ"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"ቅድመ-ዕይታ"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"መደበኛ አማራጮች"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"ቋንቋ"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"የመግለጫ ጽሁፍ መጠን"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"የመግለጫ ጽሁፍ ቅጥ"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"ብጁ አማራጮች"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"የጀርባ ቀለም"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"የዚህ ቪፒኤን ግንኙነት ይቋረጥ?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"ግንኙነት አቋርጥ"</string>
     <string name="vpn_version" msgid="6344167191984400976">"ስሪት"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"VPNን እርሳ"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"አሁን ያለው VPN ይተካ?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"ሁልጊዜ-የበራ VPN ይቀናበር?"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"ቅንብሮች ውስጥ ይፈልጉ"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"ዕውቂያዎች፣ ማከማቻ፣ መለያ"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"የዕውቂያዎች ማከማቻ"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"መሣሪያ ብቻ"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"አዳዲስ ዕውቂያዎች በመለያ አይሰምሩም"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"ዕውቂያዎች ወደ መሣሪያዎ ይቀመጣሉ እና በነባሪ ከመለያዎ ጋር ይሰምራሉ"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"ምንም ነባሪ አልተቀናበረም"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"ለመጀመር መለያ ያክሉ"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 5f924b2..9ed661b 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"حقيبة يد"</item>
-    <item msgid="184985872234062767">"مبنى كلاسيكي"</item>
-    <item msgid="9189550412466785530">"مبنى سكني"</item>
-    <item msgid="2142527562511049422">"فقاعة تفسيرية كلامية"</item>
-    <item msgid="2548100558260478605">"مجموعة من الأشخاص"</item>
-    <item msgid="2270003903304578284">"مصباح كهربائي"</item>
-    <item msgid="4793496619091161864">"تقويم"</item>
-    <item msgid="5673625795644364100">"عدم الإزعاج"</item>
-    <item msgid="1423820834865831361">"شخص يجري"</item>
-    <item msgid="2037298830718732608">"غولف"</item>
-    <item msgid="2197835014443491074">"دمبل في صالة رياضية"</item>
-    <item msgid="2730180105015616518">"سباحة"</item>
-    <item msgid="2666922823253345958">"شخص يتنزه في الطبيعة"</item>
-    <item msgid="8234880356472211396">"شخص يرمي كرة"</item>
-    <item msgid="4642980625253001443">"شخص يركل"</item>
-    <item msgid="4324795269518833500">"ذراع التحكّم في الألعاب"</item>
-    <item msgid="7789966425125441125">"لوحة ألوان الرسام"</item>
-    <item msgid="663512680597461570">"ندفة ثلج"</item>
-    <item msgid="7952183800501346803">"مظلة شاطئ"</item>
-    <item msgid="799139025758265891">"أدوات ورشة عمل"</item>
-    <item msgid="1330084588359129896">"Tent"</item>
-    <item msgid="3861584909935022342">"بكرة فيلم"</item>
-    <item msgid="5827426100157335512">"كتاب"</item>
-    <item msgid="8585828346253128384">"زهرة لوتس"</item>
-    <item msgid="8788370542815300188">"Person\'s mind"</item>
-    <item msgid="7287354964767553293">"سمّاعات رأس"</item>
-    <item msgid="2530059623783800987">"تلفزيون"</item>
-    <item msgid="5307182323469376758">"قطار"</item>
-    <item msgid="4903790544026923026">"سيارة"</item>
-    <item msgid="5010405583912314582">"شوكة وسكينة"</item>
-    <item msgid="8939998598599064900">"سلة تسوّق"</item>
-    <item msgid="3379605903308731893">"طفل"</item>
-    <item msgid="7808668968550293112">"مخلب حيوان"</item>
-    <item msgid="1000692647524056504">"شارة النجمة"</item>
-    <item msgid="8270261073421676502">"شخصان"</item>
-    <item msgid="5767782819651505460">"نجمة"</item>
-    <item msgid="4368451291862729334">"قلب"</item>
-    <item msgid="2613199102208419986">"منزل"</item>
-    <item msgid="3022279986430275040">"نصف قمر"</item>
-    <item msgid="5421089790869483206">"ساعة"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 5365903..c185743 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"ضبط التاريخ والوقت تلقائيًا باستخدام إشارة الشبكة والإشارة اللاسلكية"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"المنطقة الزمنية التلقائية"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"ضبط التاريخ والوقت تلقائيًا استنادًا إلى شبكات الجوّال القريبة منك"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"‏يمكن ضبط التاريخ والوقت تلقائيًا باستخدام الموقع الجغرافي لجهازك، إذا كان متاحًا. وقد يُطلَب الاتصال بشبكة Wi-Fi نشِطة."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"استخدام التنسيق التلقائي المحلي"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"استخدام تنسيق ٢٤ ساعة"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"الوقت"</string>
@@ -1958,6 +1959,14 @@
     <string name="sticky_keys_summary" msgid="1844953803625480623">"اضغط على مفتاح واحد في كل مرة للحصول على الاختصارات بدلاً من الضغط باستمرار على المفاتيح معًا"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"مفاتيح الماوس"</string>
     <string name="mouse_keys_summary" msgid="7030731235143286467">"يمكنك استخدام لوحة المفاتيح للتحكّم في المؤشر"</string>
+    <!-- no translation found for mouse_reverse_vertical_scrolling (154907817154779952) -->
+    <skip />
+    <!-- no translation found for mouse_reverse_vertical_scrolling_summary (3386655598642587942) -->
+    <skip />
+    <!-- no translation found for mouse_swap_primary_button (3028204969091057207) -->
+    <skip />
+    <!-- no translation found for mouse_swap_primary_button_summary (3276638019321067902) -->
+    <skip />
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"اختصارات لوحة المفاتيح"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"إظهار قائمة الاختصارات"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"لوحات مفاتيح وأدوات ملف العمل"</string>
@@ -2026,9 +2035,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"اختيار مفتاح جديد لـ \"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>\":"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"تسهيل استخدام لوحة المفاتيح الخارجية"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"ميزة \"تثبيت المفاتيح\" وميزة \"تجاهُل النقرات المتكرّرة\" ومفاتيح الماوس"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"التنسيق <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"تلقائي"</string>
@@ -2979,6 +2992,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"‏هل تريد قطع الاتصال بهذه شبكة VPN؟"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"قطع الاتصال"</string>
     <string name="vpn_version" msgid="6344167191984400976">"الإصدار"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"‏نسيان شبكة VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"‏هل تريد استبدال شبكة VPN الحالية؟"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"‏هل تريد تشغيل شبكة VPN باستمرار؟"</string>
@@ -5463,4 +5478,8 @@
     <string name="contacts_storage_selection_message" msgid="8082077300632059003">"سيتم حفظ جهات الاتصال على جهازك ومزامَنتها مع حسابك تلقائيًا"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"لم يتم ضبط حساب تلقائي"</string>
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"يُرجى إضافة حساب للبدء"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
+    <skip />
 </resources>
diff --git a/res/values-as/arrays.xml b/res/values-as/arrays.xml
index bddefce..20c6a8d 100644
--- a/res/values-as/arrays.xml
+++ b/res/values-as/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"ব্ৰিফকেছ"</item>
-    <item msgid="184985872234062767">"ক্লাছিকেল ভৱন"</item>
-    <item msgid="9189550412466785530">"এপাৰ্টমেণ্ট ভৱন"</item>
-    <item msgid="2142527562511049422">"কথনৰ বাবল"</item>
-    <item msgid="2548100558260478605">"লোকসকলৰ গোট"</item>
-    <item msgid="2270003903304578284">"লাইটৰ বাল্ব"</item>
-    <item msgid="4793496619091161864">"কেলেণ্ডাৰ"</item>
-    <item msgid="5673625795644364100">"অসুবিধা নিদিব ম’ড"</item>
-    <item msgid="1423820834865831361">"দৌৰি থকা ব্যক্তি"</item>
-    <item msgid="2037298830718732608">"গল্ফ"</item>
-    <item msgid="2197835014443491074">"ব্যায়ামাগাৰৰ ডাম্বেল"</item>
-    <item msgid="2730180105015616518">"সাঁতোৰা"</item>
-    <item msgid="2666922823253345958">"পাহাৰ বগাই থকা ব্যক্তি"</item>
-    <item msgid="8234880356472211396">"বল দলিয়াই থকা ব্যক্তি"</item>
-    <item msgid="4642980625253001443">"গোৰ মাৰি থকা ব্যক্তি"</item>
-    <item msgid="4324795269518833500">"গে’ম নিয়ন্ত্ৰক"</item>
-    <item msgid="7789966425125441125">"শিল্পীৰ ৰঙৰ পেলেট"</item>
-    <item msgid="663512680597461570">"তুষাৰ কণিকা"</item>
-    <item msgid="7952183800501346803">"সমুদ্ৰতীৰৰ ছাতি"</item>
-    <item msgid="799139025758265891">"কৰ্মশালাৰ সঁজুলি"</item>
-    <item msgid="1330084588359129896">"তম্বু"</item>
-    <item msgid="3861584909935022342">"ফিল্মৰ ৰীল"</item>
-    <item msgid="5827426100157335512">"কিতাপ"</item>
-    <item msgid="8585828346253128384">"পদুম ফুল"</item>
-    <item msgid="8788370542815300188">"ব্যক্তিৰ মন"</item>
-    <item msgid="7287354964767553293">"হেডফ’ন"</item>
-    <item msgid="2530059623783800987">"টিভি"</item>
-    <item msgid="5307182323469376758">"ৰে’ল"</item>
-    <item msgid="4903790544026923026">"গাড়ী"</item>
-    <item msgid="5010405583912314582">"কাঁটাচামুচ আৰু ছুৰী কটাৰী"</item>
-    <item msgid="8939998598599064900">"শ্বপিং কাৰ্ট"</item>
-    <item msgid="3379605903308731893">"শিশু"</item>
-    <item msgid="7808668968550293112">"জন্তুৰ হাতোৰা"</item>
-    <item msgid="1000692647524056504">"তৰাৰ বেজ"</item>
-    <item msgid="8270261073421676502">"দুগৰাকী লোক"</item>
-    <item msgid="5767782819651505460">"তৰাচিহ্ন"</item>
-    <item msgid="4368451291862729334">"হৃদয়"</item>
-    <item msgid="2613199102208419986">"ঘৰ"</item>
-    <item msgid="3022279986430275040">"অৰ্ধ-চন্দ্ৰ"</item>
-    <item msgid="5421089790869483206">"ঘড়ী"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index a0ded4d..6fa8b0e 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"আপোনাৰ নেটৱৰ্ক আৰু বেতাঁৰ ছিগনেল ব্যৱহাৰ কৰি স্বয়ংক্ৰিয়ভাৱে ছেট কৰক"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"স্বয়ংক্ৰিয় সময় মণ্ডল"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"আপোনাৰ নিকটৱৰ্তী ম’বাইল নেটৱৰ্ক অনুযায়ী স্বয়ংক্ৰিয়ভাৱে ছেট কৰক"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"উপলব্ধ হ’লে আপোনাৰ ডিভাইচৰ অৱস্থান ব্যৱহাৰ কৰি স্বয়ংক্ৰিয়ভাৱে ছেট কৰক। সক্ৰিয় ৱাইফাই সংযোগৰ প্ৰয়োজন হ’ব পাৰে।"</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"স্থানীয় ডিফ’ল্ট ব্যৱহাৰ কৰক"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"২৪ ঘণ্টীয়া সজ্জা ব্যৱহাৰ কৰক"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"সময়"</string>
@@ -1958,6 +1959,10 @@
     <string name="sticky_keys_summary" msgid="1844953803625480623">"একেলগে কীসমূহ টিপি ধৰি থকাৰ সলনি শ্বৰ্টকাটৰ বাবে এবাৰত এটা কী টিপক"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"মাউছ কীসমূহ"</string>
     <string name="mouse_keys_summary" msgid="7030731235143286467">"পইণ্টাৰ নিয়ন্ত্ৰণ কৰিবলৈ আপোনাৰ কীব’ৰ্ড ব্যৱহাৰ কৰক"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"মাউছ ওলোটাকৈ স্ক্ৰ’ল কৰাৰ সুবিধা"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"পৃষ্ঠাটো তললৈ নিবলৈ ওপৰলৈ স্ক্ৰ’ল কৰক"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"বাওঁ আৰু সোঁফালৰ বুটাম সলনা-সলনি কৰক"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"মাউছৰ বাওঁফালৰ বুটামটো আপোনাৰ সোঁফালৰ হিচাপে ব্যৱহাৰ কৰক"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"কীব’ৰ্ডৰ শ্বৰ্টকাটসমূহ"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"শ্বৰ্টকাটৰ সূচী দেখুৱাওক"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"কৰ্মস্থানৰ প্ৰ’ফাইল আৰু সঁজুলি"</string>
@@ -2026,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>ৰ বাবে এটা নতুন চাবি বাছনি কৰক:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"কায়িক কীব’ৰ্ডৰ সাধ্য সুবিধা"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"ষ্টিকী কী, বাউন্স কী, মাউছ কী"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> লে’আউট"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ডিফ\'ল্ট"</string>
@@ -2434,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"পূৰ্বদৰ্শন"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"মান্য বিকল্পসমূহ"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"ভাষা"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"কেপশ্বনৰ আকাৰ"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"কেপশ্বন শৈলী"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"কাষ্টম বিকল্পসমূহ"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"বেকগ্ৰাউণ্ডৰ ৰং"</string>
@@ -2979,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"এই ভিপিএনটোৰ সৈতে সংযোগ বিচ্ছিন্ন কৰিবনে?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"সংযোগ বিচ্ছিন্ন কৰক"</string>
     <string name="vpn_version" msgid="6344167191984400976">"সংস্কৰণ"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"ভিপিএন পাহৰক"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"পূৰ্বৰ ভিপিএনটো সলনি কৰেনে?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"ভিপিএনক যিকোনো সময়ত অন থকা অবস্থাত ছেট কৰিবনে?"</string>
@@ -5459,4 +5469,8 @@
     <string name="contacts_storage_selection_message" msgid="8082077300632059003">"সম্পৰ্কসমূহ আপোনাৰ ডিভাইচত ছেভ কৰা হ’ব আৰু ডিফ’ল্টভাৱে আপোনাৰ একাউণ্টত ছিংক কৰা হ’ব"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"কোনো ডিফ\'ল্ট ছেট কৰা হোৱা নাই"</string>
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"আৰম্ভ কৰিবলৈ এটা একাউণ্ট যোগ দিয়ক"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
+    <skip />
 </resources>
diff --git a/res/values-az/arrays.xml b/res/values-az/arrays.xml
index e035d4e..dd513d4 100644
--- a/res/values-az/arrays.xml
+++ b/res/values-az/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Portfel"</item>
-    <item msgid="184985872234062767">"Klassik bina"</item>
-    <item msgid="9189550412466785530">"Yaşayış binası"</item>
-    <item msgid="2142527562511049422">"Danışıq qabarcığı"</item>
-    <item msgid="2548100558260478605">"İnsan qrupu"</item>
-    <item msgid="2270003903304578284">"Elektrik lampası"</item>
-    <item msgid="4793496619091161864">"Təqvim"</item>
-    <item msgid="5673625795644364100">"Narahat Etməyin"</item>
-    <item msgid="1423820834865831361">"Qaçan insan"</item>
-    <item msgid="2037298830718732608">"Qolf"</item>
-    <item msgid="2197835014443491074">"İdman zalı qanteli"</item>
-    <item msgid="2730180105015616518">"Üzgüçülük"</item>
-    <item msgid="2666922823253345958">"Haykinq edən insan"</item>
-    <item msgid="8234880356472211396">"Top atan insan"</item>
-    <item msgid="4642980625253001443">"Təpik vuran insan"</item>
-    <item msgid="4324795269518833500">"Oyun kontrolleri"</item>
-    <item msgid="7789966425125441125">"Rəssamın rəng palitrası"</item>
-    <item msgid="663512680597461570">"Qar uçqunu"</item>
-    <item msgid="7952183800501346803">"Çimərlik çətiri"</item>
-    <item msgid="799139025758265891">"Emalatxana alətləri"</item>
-    <item msgid="1330084588359129896">"Çadır"</item>
-    <item msgid="3861584909935022342">"Kinolent"</item>
-    <item msgid="5827426100157335512">"Kitab"</item>
-    <item msgid="8585828346253128384">"Lotus çiçəyi"</item>
-    <item msgid="8788370542815300188">"İnsan zehni"</item>
-    <item msgid="7287354964767553293">"Qulaqlıqlar"</item>
-    <item msgid="2530059623783800987">"TV"</item>
-    <item msgid="5307182323469376758">"Qatar"</item>
-    <item msgid="4903790544026923026">"Avtomobil"</item>
-    <item msgid="5010405583912314582">"Çəngəl-bıçaq"</item>
-    <item msgid="8939998598599064900">"Səbət"</item>
-    <item msgid="3379605903308731893">"Uşaq"</item>
-    <item msgid="7808668968550293112">"Heyvan pəncəsi"</item>
-    <item msgid="1000692647524056504">"Ulduz nişanı"</item>
-    <item msgid="8270261073421676502">"İki insan"</item>
-    <item msgid="5767782819651505460">"Ulduz"</item>
-    <item msgid="4368451291862729334">"Ürək"</item>
-    <item msgid="2613199102208419986">"Ev"</item>
-    <item msgid="3022279986430275040">"Yarım ay"</item>
-    <item msgid="5421089790869483206">"Saat"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index b2bc577..3b6a0b3 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Şəbəkə və simsiz siqnallarınızdan istifadə edərək avtomatik təyin edin"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Avtomatik saat qurşağı"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Yaxınlıqdakı mobil şəbəkələrə əsasən avtomatik təyin edin"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Mümkünsə, cihaz məkanı vasitəsilə avtomatik təyin edin. Aktiv Wi-Fi bağlantısı da tələb oluna bilər."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Regional defolt ayarlar tətbiq olunsun"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24 saat formatından istifadə et"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Vaxt"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Əlçatımlıq"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Fiziki klaviatura"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Sıçrama düymələri"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Klaviatura eyni düymənin təkrarən basılmasını nəzərə almır"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Sıçrayan klaviş üzrə hədd"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Klaviaturanızın təkrarlanan düymə basılmalarını nəzərə almayacağı müddəti seçin"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2s"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4s"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0,6s"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Asta düymələr"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Düyməyə basmağın aktivləşdirilməsi üçün tələb olunan vaxtı tənzimləyir"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Əvəzedici düymələr"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Qısayollar üçün düymələri birlikdə basıb saxlamaq əvəzinə hər dəfə bir düyməyə basın"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Maus düymələri"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Poynteri idarə etmək üçün klaviaturadan istifadə edin"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Mausun geri sürüşdürülməsi"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Səhifəni aşağı hərəkət etdirmək üçün yuxarı sürüşdürün"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Sol və sağ düymələri dəyişin"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Mausun sol düyməsini sağ kimi istifadə edin"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Klaviatura qısayolları"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Qısayolların siyahısını göstərin"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"İş profili klaviaturaları və alətlər"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> üçün yeni açar seçin:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Fiziki klaviatura əlçatanlığı"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Əvəzedici düymələr, sıçrama düymələri, maus düymələri"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> düzəni"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Defolt"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Önizləmə"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standart seçimlər"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Dil"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Subtitr ölçüsü"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Subtitr üslubu"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Fərdi seçimlər"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Arxa plan rəngi"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Bu VPN bağlantısı kəsilsin?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Bağlantını kəsin"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versiya"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN\'i unudun"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Mövcud VPN əvəz edilsin?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Hər zaman aktiv VPN quraşdırılsın?"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Axtarış Ayarları"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"kontaktlar, yaddaş, hesab"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Kontakt yaddaşı"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Yalnız cihaz"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Yeni kontaktlar hesab ilə sinxronlaşdırılmayacaq"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kontaktlar cihazınızda saxlanılacaq və defolt olaraq hesabınız ilə sinxronlaşdırılacaq"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Defolt ayarlanmayıb"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Başlamaq üçün hesab əlavə edin"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-b+sr+Latn/arrays.xml b/res/values-b+sr+Latn/arrays.xml
index 9536100..4ddf543 100644
--- a/res/values-b+sr+Latn/arrays.xml
+++ b/res/values-b+sr+Latn/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Aktovka"</item>
-    <item msgid="184985872234062767">"Klasična zgrada"</item>
-    <item msgid="9189550412466785530">"Stambena zgrada"</item>
-    <item msgid="2142527562511049422">"Oblačić"</item>
-    <item msgid="2548100558260478605">"Grupa ljudi"</item>
-    <item msgid="2270003903304578284">"Sijalica"</item>
-    <item msgid="4793496619091161864">"Kalendar"</item>
-    <item msgid="5673625795644364100">"Ne uznemiravaj"</item>
-    <item msgid="1423820834865831361">"Osoba koja trči"</item>
-    <item msgid="2037298830718732608">"Golf"</item>
-    <item msgid="2197835014443491074">"Teg za teretanu"</item>
-    <item msgid="2730180105015616518">"Plivanje"</item>
-    <item msgid="2666922823253345958">"Osoba koja pešači"</item>
-    <item msgid="8234880356472211396">"Osoba koja baca loptu"</item>
-    <item msgid="4642980625253001443">"Osoba koja šutira"</item>
-    <item msgid="4324795269518833500">"Kontroler za igre"</item>
-    <item msgid="7789966425125441125">"Paleta boja umetnika"</item>
-    <item msgid="663512680597461570">"Pahulja"</item>
-    <item msgid="7952183800501346803">"Suncobran"</item>
-    <item msgid="799139025758265891">"Alat iz radionice"</item>
-    <item msgid="1330084588359129896">"Šator"</item>
-    <item msgid="3861584909935022342">"Rolna filma"</item>
-    <item msgid="5827426100157335512">"Knjiga"</item>
-    <item msgid="8585828346253128384">"Cvet lotosa"</item>
-    <item msgid="8788370542815300188">"Ljudski mozak"</item>
-    <item msgid="7287354964767553293">"Slušalice"</item>
-    <item msgid="2530059623783800987">"TV"</item>
-    <item msgid="5307182323469376758">"Voz"</item>
-    <item msgid="4903790544026923026">"Automobil"</item>
-    <item msgid="5010405583912314582">"Viljuška i nož"</item>
-    <item msgid="8939998598599064900">"Kolica za kupovinu"</item>
-    <item msgid="3379605903308731893">"Dete"</item>
-    <item msgid="7808668968550293112">"Šapa životinje"</item>
-    <item msgid="1000692647524056504">"Značka sa zvezdicom"</item>
-    <item msgid="8270261073421676502">"Dve osobe"</item>
-    <item msgid="5767782819651505460">"Zvezda"</item>
-    <item msgid="4368451291862729334">"Srce"</item>
-    <item msgid="2613199102208419986">"Kuća"</item>
-    <item msgid="3022279986430275040">"Polumesec"</item>
-    <item msgid="5421089790869483206">"Sat"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index a66625c..780caf2 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Automatsko podešavanje pomoću mreže i bežičnih signala"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Automatska vremenska zona"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Automatsko podešavanje na osnovu mobilnih mreža u blizini"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Automatsko podešavanje pomoću lokacije uređaja, ako je dostupna. Možda je potrebna i aktivna WiFi veza."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Koristi podrazumevanu vrednost za lokalitet"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Koristi 24-časovni format"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Vreme"</string>
@@ -1958,6 +1959,10 @@
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Pritiskajte jedan po jedan taster da biste koristili prečice umesto da istovremeno držite tastere"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Tasteri miša"</string>
     <string name="mouse_keys_summary" msgid="7030731235143286467">"Kontrolišite pokazivač pomoću tastature"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Obrnuto skrolovanje mišem"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Skrolujte nagore da biste pomerili stranicu nadole"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Zamenite dugmad nalevo i nadesno"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Koristite levi taster miša kao desni"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Tasterske prečice"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Prikazuje listu prečica"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Tastature i alatke za poslovni profil"</string>
@@ -2026,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Odaberite novi taster za <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Pristupačnost fizičke tastature"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Lepljivi tasteri, duži odziv tastera, tasteri miša"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Raspored <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Podrazumevano"</string>
@@ -2434,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Pregled"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standardne opcije"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Jezik"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Veličina titla"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Stil titla"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Prilagođene opcije"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Boja pozadine"</string>
@@ -2979,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Želite li da prekinete vezu sa ovim VPN-om?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Prekini vezu"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Verzija"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Zaboravi VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Želite li da zamenite postojeći VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Želite li da podesite uvek uključeni VPN?"</string>
@@ -5460,4 +5470,8 @@
     <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kontakti se podrazumevano čuvaju na uređaju i sinhronizuju sa nalogom"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Nije podešen podrazumevani nalog"</string>
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Dodajte nalog da biste započeli"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
+    <skip />
 </resources>
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index ab14c2b..efe6260 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Партфель"</item>
-    <item msgid="184985872234062767">"Класічны будынак"</item>
-    <item msgid="9189550412466785530">"Шматкватэрны дом"</item>
-    <item msgid="2142527562511049422">"Бурбалка з тэкстам"</item>
-    <item msgid="2548100558260478605">"Група людзей"</item>
-    <item msgid="2270003903304578284">"Лямпачка"</item>
-    <item msgid="4793496619091161864">"Каляндар"</item>
-    <item msgid="5673625795644364100">"Не турбаваць"</item>
-    <item msgid="1423820834865831361">"Чалавек бяжыць"</item>
-    <item msgid="2037298830718732608">"Гольф"</item>
-    <item msgid="2197835014443491074">"Трэнажорная гантэль"</item>
-    <item msgid="2730180105015616518">"Плаванне"</item>
-    <item msgid="2666922823253345958">"Чалавек у паходзе"</item>
-    <item msgid="8234880356472211396">"Чалавек кідае мяч"</item>
-    <item msgid="4642980625253001443">"Чалавек б’е нагой"</item>
-    <item msgid="4324795269518833500">"Гульнявы кантролер"</item>
-    <item msgid="7789966425125441125">"Палітра мастака"</item>
-    <item msgid="663512680597461570">"Сняжынка"</item>
-    <item msgid="7952183800501346803">"Пляжны парасон"</item>
-    <item msgid="799139025758265891">"Інструменты майстэрні"</item>
-    <item msgid="1330084588359129896">"Палатка"</item>
-    <item msgid="3861584909935022342">"Кінаплёнка"</item>
-    <item msgid="5827426100157335512">"Кніга"</item>
-    <item msgid="8585828346253128384">"Кветка лотаса"</item>
-    <item msgid="8788370542815300188">"Розум чалавека"</item>
-    <item msgid="7287354964767553293">"Навушнікі"</item>
-    <item msgid="2530059623783800987">"Тэлевізар"</item>
-    <item msgid="5307182323469376758">"Цягнік"</item>
-    <item msgid="4903790544026923026">"Аўтамабіль"</item>
-    <item msgid="5010405583912314582">"Відэлец і нож"</item>
-    <item msgid="8939998598599064900">"Каляска для пакупак"</item>
-    <item msgid="3379605903308731893">"Дзіця"</item>
-    <item msgid="7808668968550293112">"Лапа жывёлы"</item>
-    <item msgid="1000692647524056504">"Значок зоркі"</item>
-    <item msgid="8270261073421676502">"Два чалавекі"</item>
-    <item msgid="5767782819651505460">"Зорка"</item>
-    <item msgid="4368451291862729334">"Сэрца"</item>
-    <item msgid="2613199102208419986">"Дом"</item>
-    <item msgid="3022279986430275040">"Паўмесяц"</item>
-    <item msgid="5421089790869483206">"Гадзіннік"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 4b6de65..8f8232b 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Задаваць аўтаматычна, выкарыстоўваючы сігналы сеткі і бесправадныя сігналы прылады"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Аўтавызначэнне часавага пояса"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Задаваць аўтаматычна па даных бліжэйшых мабільных сетак"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Задаваць аўтаматычна па месцазнаходжанню прылады, калі яно вызначаецца. Можа спатрэбіцца актыўнае падключэнне да Wi-Fi."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Выкарыстоўваць стандартныя рэгіянальныя налады"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Выкарыстоўваць 24-гадзінны фармат"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Час"</string>
@@ -1946,25 +1947,25 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Спецыяльныя магчымасці"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Фізічная клавіятура"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Ігнараванне паўторнага націскання"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Хуткія паўторныя націсканні адной і той жа клавішы ігнаруюцца"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Ігнараванне паўторнага націскання"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Выберыце час, на працягу якога паўторныя націсканні адной і той жа клавішы будуць ігнаравацца"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2 с"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4 с"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0,6 с"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Запавольванне рэакцыі на націсканне"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Адрэгулюйце час, неабходны для актывацыі націскання клавішы"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Заліпанне клавіш"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Замест таго каб утрымліваць усе клавішы са спалучэння, націскайце іх па адной"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Кнопкі мышы"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Выкарыстоўвайце клавіятуру, каб кіраваць паказальнікам"</string>
+    <!-- no translation found for mouse_reverse_vertical_scrolling (154907817154779952) -->
+    <skip />
+    <!-- no translation found for mouse_reverse_vertical_scrolling_summary (3386655598642587942) -->
+    <skip />
+    <!-- no translation found for mouse_swap_primary_button (3028204969091057207) -->
+    <skip />
+    <!-- no translation found for mouse_swap_primary_button_summary (3276638019321067902) -->
     <skip />
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Гарачыя клавішы"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Паказаць спіс спалучэнняў клавіш"</string>
@@ -2034,9 +2035,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Выберыце новы ключ для \"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>\":"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Спецыяльныя магчымасці з выкарыстаннем фізічнай клавіятуры"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Заліпанне клавіш, ігнараванне паўторнага націскання, клавішы мышы"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Раскладка \"<xliff:g id="IME_LABEL">%s</xliff:g>\""</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Стандартная"</string>
@@ -2987,6 +2992,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Адключыць гэту VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Адключыць"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Версія"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Забыць VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Замяніць існуючую VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Наладзіць заўсёды ўключаную VPN?"</string>
@@ -5464,13 +5471,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Шукаць у наладах"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"кантакты, сховішча, уліковы запіс"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Сховішча кантактаў"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Толькі прылада"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Новыя кантакты не будуць сінхранізавацца з уліковым запісам"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Кантакты будуць стандартна захоўвацца на прыладзе і сінхранізавацца з уліковым запісам"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Стандарт не вызначаны"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Каб пачаць, дадайце ўліковы запіс"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 631450e..79c9305 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Куфарче"</item>
-    <item msgid="184985872234062767">"Класическа сграда"</item>
-    <item msgid="9189550412466785530">"Жилищна сграда"</item>
-    <item msgid="2142527562511049422">"Балонче за реч"</item>
-    <item msgid="2548100558260478605">"Група хора"</item>
-    <item msgid="2270003903304578284">"Електрическа крушка"</item>
-    <item msgid="4793496619091161864">"Календар"</item>
-    <item msgid="5673625795644364100">"Не безпокойте"</item>
-    <item msgid="1423820834865831361">"Бягащ човек"</item>
-    <item msgid="2037298830718732608">"Голф"</item>
-    <item msgid="2197835014443491074">"Гира за фитнес"</item>
-    <item msgid="2730180105015616518">"Плуване"</item>
-    <item msgid="2666922823253345958">"Човек на пешеходен туризъм"</item>
-    <item msgid="8234880356472211396">"Човек, хвърлящ топка"</item>
-    <item msgid="4642980625253001443">"Ритащ човек"</item>
-    <item msgid="4324795269518833500">"Контролер за игри"</item>
-    <item msgid="7789966425125441125">"Цветова палитра на художник"</item>
-    <item msgid="663512680597461570">"Снежинка"</item>
-    <item msgid="7952183800501346803">"Плажен чадър"</item>
-    <item msgid="799139025758265891">"Инструменти за работилница"</item>
-    <item msgid="1330084588359129896">"Палатка"</item>
-    <item msgid="3861584909935022342">"Филмов видеоколаж"</item>
-    <item msgid="5827426100157335512">"Книга"</item>
-    <item msgid="8585828346253128384">"Лотос"</item>
-    <item msgid="8788370542815300188">"Човешки ум"</item>
-    <item msgid="7287354964767553293">"Слушалки"</item>
-    <item msgid="2530059623783800987">"Телевизор"</item>
-    <item msgid="5307182323469376758">"Влак"</item>
-    <item msgid="4903790544026923026">"Автомобил"</item>
-    <item msgid="5010405583912314582">"Вилица и нож"</item>
-    <item msgid="8939998598599064900">"Пазарска кошница"</item>
-    <item msgid="3379605903308731893">"Дете"</item>
-    <item msgid="7808668968550293112">"Лапа на животно"</item>
-    <item msgid="1000692647524056504">"Значка със звезда"</item>
-    <item msgid="8270261073421676502">"Двама души"</item>
-    <item msgid="5767782819651505460">"Звезда"</item>
-    <item msgid="4368451291862729334">"Сърце"</item>
-    <item msgid="2613199102208419986">"Къща"</item>
-    <item msgid="3022279986430275040">"Полумесец"</item>
-    <item msgid="5421089790869483206">"Часовник"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index d3ddd40..c580331 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Автоматично задаване чрез мрежата и безжичните сигнали"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Автоматична часова зона"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Автоматично задаване въз основа на мобилните мрежи в близост до вас"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Авт. задаване чрез местоп. на у-вото ви, ако е налице. Може да се изисква и активна връзка с Wi-Fi."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Използване на стандартния формат за локала"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-часов формат"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Час"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Достъпност"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Физическа клавиатура"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Игнориране на многократ. натискане"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Клавиатурата игнорира бързите повтарящи се натискания на един и същ клавиш"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Игнор. на многокр. натискане (праг)"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Изберете периода от време, през който клавиатурата ви ще игнорира повтарящите се натискания на даден клавиш"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2 сек"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4 сек"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0,6 сек"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Забавяне на сигнала от клавишите"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Коригира времето, необходимо за активиране след натискане на даден клавиш"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Фиксирани клавиши"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Натискайте клавишите от съответните комбинации един по един, вместо да ги задържате заедно"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Бутони на мишката"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Използвайте клавиатурата, за да управлявате курсора"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Обратно превъртане с мишката"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Превъртете нагоре, за да преместите страницата надолу"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Размяна на левия и десния бутон"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Използвайте левия бутон на мишката като десен"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Клавишни комбинации"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Показване на списък с клавишните комбинации"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Клавиатури и инструменти за служебния потр. профил"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Изберете нов ключ за <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Достъпност чрез физическата клавиатура"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Фиксирани клавиши, игнориране на многократни натискания, бутони на мишката"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Подредба: <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"По подразбиране"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Визуализация"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Стандартни опции"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Език"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Размер на надписите"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Стил на надписите"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Персонализирани опции"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Цвят на фона"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Да се прекрати ли връзката с тази виртуална частна мрежа (VPN)?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Прекратяване на връзката"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Версия"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Забравяне на вирт. частна мрежа (VPN)"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Да се замени ли съществуващата VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Да се зададе ли винаги включена виртуална частна мрежа (VPN)?"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Търсене в настройките"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"контакти, хранилище, профил"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Хранилище на контакти"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Само на устройството"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Новите контакти няма да се синхронизират с профил"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"По подразбиране контактите ще се запазват на устройството ви и ще се синхронизират с профила ви"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Няма профил по подразбиране"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"За да започнете, добавете профил"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-bn/arrays.xml b/res/values-bn/arrays.xml
index 5b14f56..7cfa000 100644
--- a/res/values-bn/arrays.xml
+++ b/res/values-bn/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"ব্রিফকেস"</item>
-    <item msgid="184985872234062767">"ক্লাসিক্যাল বিল্ডিং"</item>
-    <item msgid="9189550412466785530">"অ্যাপার্টমেন্ট বিল্ডিং"</item>
-    <item msgid="2142527562511049422">"স্পিচ বাবল"</item>
-    <item msgid="2548100558260478605">"লোকজনের গ্রুপ"</item>
-    <item msgid="2270003903304578284">"লাইট বাল্ব"</item>
-    <item msgid="4793496619091161864">"ক্যালেন্ডার"</item>
-    <item msgid="5673625795644364100">"বিরক্ত করবে না"</item>
-    <item msgid="1423820834865831361">"দৌড়াচ্ছেন এমন ব্যক্তি"</item>
-    <item msgid="2037298830718732608">"গল্ফ খেলা"</item>
-    <item msgid="2197835014443491074">"জিম ডাম্বেল"</item>
-    <item msgid="2730180105015616518">"সাঁতার কাটা"</item>
-    <item msgid="2666922823253345958">"হাইকিং করছেন এমন ব্যক্তি"</item>
-    <item msgid="8234880356472211396">"বল ছুঁড়ছেন এমন ব্যক্তি"</item>
-    <item msgid="4642980625253001443">"কিক মারছেন এমন ব্যক্তি"</item>
-    <item msgid="4324795269518833500">"গেম কন্ট্রোলার"</item>
-    <item msgid="7789966425125441125">"শিল্পীর জন্য রঙের প্যালেট"</item>
-    <item msgid="663512680597461570">"বরফের কণা"</item>
-    <item msgid="7952183800501346803">"বিচ আমব্রেলা"</item>
-    <item msgid="799139025758265891">"ওয়ার্কশপ টুল"</item>
-    <item msgid="1330084588359129896">"তাঁবু"</item>
-    <item msgid="3861584909935022342">"ফিল্ম রিল"</item>
-    <item msgid="5827426100157335512">"বই"</item>
-    <item msgid="8585828346253128384">"পদ্ম ফুল"</item>
-    <item msgid="8788370542815300188">"ব্যক্তির মন"</item>
-    <item msgid="7287354964767553293">"হেডফোন"</item>
-    <item msgid="2530059623783800987">"টিভি"</item>
-    <item msgid="5307182323469376758">"ট্রেন"</item>
-    <item msgid="4903790544026923026">"গাড়ি"</item>
-    <item msgid="5010405583912314582">"কাঁটা চামচ ও ছুরি"</item>
-    <item msgid="8939998598599064900">"শপিং কার্ট"</item>
-    <item msgid="3379605903308731893">"বাচ্চা"</item>
-    <item msgid="7808668968550293112">"পশুর পাঞ্জা"</item>
-    <item msgid="1000692647524056504">"স্টার ব্যাজ"</item>
-    <item msgid="8270261073421676502">"দুজন ব্যক্তি"</item>
-    <item msgid="5767782819651505460">"স্টার"</item>
-    <item msgid="4368451291862729334">"হার্ট"</item>
-    <item msgid="2613199102208419986">"বাড়ি-ঘর"</item>
-    <item msgid="3022279986430275040">"হাফ-মুন"</item>
-    <item msgid="5421089790869483206">"ঘড়ি"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 042aac7..d701343 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"আপনার নেটওয়ার্ক ও ওয়্যারলেস সিগন্যাল ব্যবহার করে অটোমেটিক সেট করুন"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"অটোমেটিক টাইম জোন"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"আপনার কাছাকাছি মোবাইল নেটওয়ার্কের উপর নির্ভর করে অটোমেটিক সেট করুন"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"উপলভ্য থাকলে, আপনার ডিভাইসের লোকেশন ব্যবহার করে অটোমেটিক সেট করুন। চালু থাকা একটি ওয়াই-ফাই কানেকশনও প্রয়োজন হতে পারে।"</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"লোকেল ডিফল্ট ব্যবহার করুন"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"২৪ ঘন্টার ফর্ম্যাট ব্যবহার করুন"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"সময়"</string>
@@ -1958,6 +1959,10 @@
     <string name="sticky_keys_summary" msgid="1844953803625480623">"শর্টকাটের জন্য কীগুলি একসাথে ধরে রাখার পরিবর্তে একবারে একটি কী প্রেস করুন"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"মাউস \'কী\'"</string>
     <string name="mouse_keys_summary" msgid="7030731235143286467">"পয়েন্টার নিয়ন্ত্রণ করতে আপনার কীবোর্ড ব্যবহার করুন"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"মাউস উল্টো দিকে স্ক্রল করা"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"পৃষ্ঠা নিচের দিকে নামাতে উপরের দিকে স্ক্রল করুন"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"বাঁদিক ও ডানদিকের বোতাম অদলবদল করুন"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"মাউসের বাঁদিকের বোতামটিকে ডানদিকের বোতাম হিসেবে ব্যবহার করুন"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"কীবোর্ড শর্টকাট"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"শর্টকাটের তালিকা দেখান"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"অফিসের প্রোফাইলের কীবোর্ড ও টুল"</string>
@@ -2026,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>-এর জন্য নতুন \'কী\' বেছে নিন:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"ফিজিক্যাল কীবোর্ডের অ্যাক্সেসিবিলিটি"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"স্টিকি কী, বাউন্স কী, মাউস কী"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> লেআউট"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ডিফল্ট"</string>
@@ -2434,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"প্রিভিউ"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"মানক বিকল্পগুলি"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"ভাষা"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"ক্যাপশনের সাইজ"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"ক্যাপশনের স্টাইল"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"কাস্টম বিকল্পগুলি"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"পশ্চাদপটের রঙ"</string>
@@ -2979,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"এই VPN থেকে ডিসকানেক্ট করবেন?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"ডিসকানেক্ট করুন"</string>
     <string name="vpn_version" msgid="6344167191984400976">"ভার্সন"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN সরিয়ে দিন"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"বিদ্যমান VPN প্রতিস্থাপন করতে চান?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"সর্বদা-চালু VPN সেট করতে চান?"</string>
@@ -5459,4 +5469,8 @@
     <string name="contacts_storage_selection_message" msgid="8082077300632059003">"সাধারণত, পরিচিতি আপনার ডিভাইসে সেভ হবে এবং আপনার অ্যাকাউন্টের সাথে সিঙ্ক হবে"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"কোনও ডিফল্ট অ্যাকাউন্ট সেট করা নেই"</string>
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"শুরু করতে একটি অ্যাকাউন্ট যোগ করুন"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
+    <skip />
 </resources>
diff --git a/res/values-bs/arrays.xml b/res/values-bs/arrays.xml
index 6b5a498..dcf6051 100644
--- a/res/values-bs/arrays.xml
+++ b/res/values-bs/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Aktovka"</item>
-    <item msgid="184985872234062767">"Klasična zgrada"</item>
-    <item msgid="9189550412466785530">"Stambena zgrada"</item>
-    <item msgid="2142527562511049422">"Govorni oblačić"</item>
-    <item msgid="2548100558260478605">"Grupa osoba"</item>
-    <item msgid="2270003903304578284">"Sijalica"</item>
-    <item msgid="4793496619091161864">"Kalendar"</item>
-    <item msgid="5673625795644364100">"Ne ometaj"</item>
-    <item msgid="1423820834865831361">"Osoba trči"</item>
-    <item msgid="2037298830718732608">"Golf"</item>
-    <item msgid="2197835014443491074">"Bučica za teretanu"</item>
-    <item msgid="2730180105015616518">"Plivanje"</item>
-    <item msgid="2666922823253345958">"Osoba pješači"</item>
-    <item msgid="8234880356472211396">"Osoba baca loptu"</item>
-    <item msgid="4642980625253001443">"Osoba udara"</item>
-    <item msgid="4324795269518833500">"Kontroler za igre"</item>
-    <item msgid="7789966425125441125">"Slikarska paleta"</item>
-    <item msgid="663512680597461570">"Pahuljica"</item>
-    <item msgid="7952183800501346803">"Suncobran"</item>
-    <item msgid="799139025758265891">"Alati radionice"</item>
-    <item msgid="1330084588359129896">"Šator"</item>
-    <item msgid="3861584909935022342">"Filmska traka"</item>
-    <item msgid="5827426100157335512">"Knjiga"</item>
-    <item msgid="8585828346253128384">"Cvijet lotosa"</item>
-    <item msgid="8788370542815300188">"Um osobe"</item>
-    <item msgid="7287354964767553293">"Slušalice"</item>
-    <item msgid="2530059623783800987">"TV"</item>
-    <item msgid="5307182323469376758">"Voz"</item>
-    <item msgid="4903790544026923026">"Automobil"</item>
-    <item msgid="5010405583912314582">"Viljuška i nož"</item>
-    <item msgid="8939998598599064900">"Kolica za kupovinu"</item>
-    <item msgid="3379605903308731893">"Dijete"</item>
-    <item msgid="7808668968550293112">"Šapa"</item>
-    <item msgid="1000692647524056504">"Značka sa zvjezdicom"</item>
-    <item msgid="8270261073421676502">"Dvije osobe"</item>
-    <item msgid="5767782819651505460">"Zvijezda"</item>
-    <item msgid="4368451291862729334">"Srce"</item>
-    <item msgid="2613199102208419986">"Kuća"</item>
-    <item msgid="3022279986430275040">"Polumjesec"</item>
-    <item msgid="5421089790869483206">"Sat"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 4d34680..43c643d 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Automatsko postavljanje putem mreže i bežičnih signala"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Automatska vremenska zona"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Automatsko postavljanje na osnovu mobilnih mreža u blizini"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Automatsko postavljanje putem lokacije uređaja, ako je dostupna. Može biti potrebna i WiFi veza."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Koristi zadani format jezika/zemlje"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Koristi 24-satni format"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Vrijeme"</string>
@@ -1946,18 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Pristupačnost"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Fizička tastatura"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Slučajni pritisci tipki"</string>
-    <string name="bounce_keys_summary" msgid="7418024428905737729">"Tipkovnica zanemaruje brzo ponovljene pritiske iste tipke"</string>
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Tastatura zanemaruje brzo ponavljane pritiske iste tipke"</string>
     <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Prag zanemarivanja slučajnih pritisaka"</string>
-    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Odaberite koliko dugo će tipkovnica zanemarivati ponovljene pritiske tipki"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Odaberite vrijeme u kojem će tastatura zanemarivati ponovljene pritiske tipki"</string>
     <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2 s"</string>
     <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4 s"</string>
     <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0,6 s"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Sporo reagiranje tipki"</string>
-    <string name="slow_keys_summary" msgid="2914214326648535377">"Prilagođava vrijeme potrebno za aktivaciju pritiska tipke"</string>
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Podešava vrijeme potrebno za aktiviranje pritiskanja tipke"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Ljepljive tipke"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Za prečice pritišćite jednu po jednu tipku umjesto da ih istovremeno zadržavate"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Tipke miša"</string>
-    <string name="mouse_keys_summary" msgid="7030731235143286467">"Upravljajte pokazivačem pomoću tipkovnice"</string>
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Koristite tastaturu da upravljate pokazivačem"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Obrnuto pomicanje pomoću miša"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Pomičite se prema gore za pomicanje stranice prema dolje"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Zamjena lijeve i desne tipke"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Upotrebljavajte lijevu tipku miša kao desnu"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Prečice tastature"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Prikaz liste prečica"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Tastatura i alati radnog profila"</string>
@@ -2026,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Odaberite novu tipku za \"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>\":"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Pristupačnost fizičke tastature"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Ljepljive tipke, tipke s dužim odzivom i tipke miša"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Raspored: <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Zadano"</string>
@@ -2434,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Pregled"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standardne opcije"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Jezik"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Veličina titlova"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Stil titlova"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Prilagođene opcije"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Boja pozadine"</string>
@@ -2979,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Želite li prekinuti vezu s ovim VPN-om?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Prekini vezu"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Verzija"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Zaboravi VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Želite li zamijeniti postojeći VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Želite li postaviti uvijek uključen VPN?"</string>
@@ -5456,8 +5466,12 @@
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"kontakti, pohrana, račun"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Pohrana za kontakte"</string>
     <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Samo uređaj"</string>
-    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Novi kontakti neće se sinkronizirati s računom"</string>
-    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kontakti će se spremiti na vaš uređaj i prema zadanim postavkama sinkronizirati s vašim računom"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Novi kontakti se neće sinhronizirati s računom"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kontakti će se sačuvati na uređaj i sinhronizirati s računom prema zadanim postavkama"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Zadani račun nije postavljen"</string>
-    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Dodajte račun da biste započeli"</string>
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Dodajte račun da započnete"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
+    <skip />
 </resources>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 9bfaf64..e4e125f 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Maletí"</item>
-    <item msgid="184985872234062767">"Edifici clàssic"</item>
-    <item msgid="9189550412466785530">"Edifici d\'apartaments"</item>
-    <item msgid="2142527562511049422">"Globus"</item>
-    <item msgid="2548100558260478605">"Grup de persones"</item>
-    <item msgid="2270003903304578284">"Bombeta"</item>
-    <item msgid="4793496619091161864">"Calendari"</item>
-    <item msgid="5673625795644364100">"No molestis"</item>
-    <item msgid="1423820834865831361">"Persona corrent"</item>
-    <item msgid="2037298830718732608">"Golf"</item>
-    <item msgid="2197835014443491074">"Pesa de gimnàs"</item>
-    <item msgid="2730180105015616518">"Natació"</item>
-    <item msgid="2666922823253345958">"Persona que fa excursionisme"</item>
-    <item msgid="8234880356472211396">"Persona que llança una pilota"</item>
-    <item msgid="4642980625253001443">"Persona que fa una puntada de peu"</item>
-    <item msgid="4324795269518833500">"Comandament de joc"</item>
-    <item msgid="7789966425125441125">"Paleta de colors d\'artista"</item>
-    <item msgid="663512680597461570">"Floc de neu"</item>
-    <item msgid="7952183800501346803">"Para-sol"</item>
-    <item msgid="799139025758265891">"Eines d\'un taller"</item>
-    <item msgid="1330084588359129896">"Tenda de campanya"</item>
-    <item msgid="3861584909935022342">"Rodet de pel·lícula"</item>
-    <item msgid="5827426100157335512">"Llibre"</item>
-    <item msgid="8585828346253128384">"Flor de lotus"</item>
-    <item msgid="8788370542815300188">"Ment d\'una persona"</item>
-    <item msgid="7287354964767553293">"Auriculars"</item>
-    <item msgid="2530059623783800987">"TV"</item>
-    <item msgid="5307182323469376758">"Tren"</item>
-    <item msgid="4903790544026923026">"Cotxe"</item>
-    <item msgid="5010405583912314582">"Forquilla i ganivet"</item>
-    <item msgid="8939998598599064900">"Carretó"</item>
-    <item msgid="3379605903308731893">"Infant"</item>
-    <item msgid="7808668968550293112">"Grapa"</item>
-    <item msgid="1000692647524056504">"Insígnia d\'estrella"</item>
-    <item msgid="8270261073421676502">"Dues persones"</item>
-    <item msgid="5767782819651505460">"Estrella"</item>
-    <item msgid="4368451291862729334">"Cor"</item>
-    <item msgid="2613199102208419986">"Casa"</item>
-    <item msgid="3022279986430275040">"Mitja lluna"</item>
-    <item msgid="5421089790869483206">"Rellotge"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index c81d720..02a5472 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Estableix automàticament amb la xarxa i els senyals sense fil"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Zona horària automàtica"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Estableix automàticament segons les xarxes mòbils properes"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Estableix auto. amb ubicació dispositiu, si disponible. Pot ser que també calgui una connexió Wi‑Fi activa."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Utilitza la configuració regional predeterminada"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Format de 24 hores"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Hora"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Accessibilitat"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Teclat físic"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Tecles de rebot"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"El teclat ignora les pulsacions repetides ràpidament de la mateixa tecla"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Llindar de la tecla de rebot"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Tria el temps que vols que el teclat ignori les pulsacions repetides de tecles"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2 s"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4 s"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0,6 s"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Tecles lentes"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Ajusta el temps que tarda la pulsació d\'una tecla en activar-se"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Tecles permanents"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Prem una tecla cada vegada per a les dreceres en lloc de mantenir premudes les tecles alhora"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Tecles del ratolí"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Utilitza el teclat per controlar el punter"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Desplaçament invers del ratolí"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Desplaça\'t cap amunt per moure la pàgina cap avall"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Canvia els botons dret i esquerre"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Utilitza el botó esquerre del ratolí com si fos el dret"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Tecles de drecera"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Mostra la llista de dreceres"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Teclats i eines del perfil de treball"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Tria una tecla nova per a <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Accessibilitat del teclat físic"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Tecles permanents, tecles de rebot, tecles del ratolí"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Disseny de <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Predeterminat"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Previsualització"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Opcions estàndard"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Idioma"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Mida dels subtítols"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Estil dels subtítols"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Opcions personalitzades"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Color de fons"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Vols desconnectar aquesta VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Desconnecta"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versió"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Oblida la VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Vols substituir la VPN actual?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Vols definir la VPN sempre activa?"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Configuració de la cerca"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"contactes, emmagatzematge, compte"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Emmagatzematge de contactes"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Només dispositiu"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Els contactes nous no se sincronitzaran amb un compte"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Els contactes es desaran al dispositiu i se sincronitzaran amb el teu compte de manera predeterminada"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Cap compte predeterminat definit"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Afegeix un compte per començar"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 5bfe008..599eed4 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Aktovka"</item>
-    <item msgid="184985872234062767">"Klasicistní budova"</item>
-    <item msgid="9189550412466785530">"Bytový dům"</item>
-    <item msgid="2142527562511049422">"Řečová bublina"</item>
-    <item msgid="2548100558260478605">"Skupina lidí"</item>
-    <item msgid="2270003903304578284">"Žárovka"</item>
-    <item msgid="4793496619091161864">"Kalendář"</item>
-    <item msgid="5673625795644364100">"Nerušit"</item>
-    <item msgid="1423820834865831361">"Běžící osoba"</item>
-    <item msgid="2037298830718732608">"Golf"</item>
-    <item msgid="2197835014443491074">"Jednoruční činka"</item>
-    <item msgid="2730180105015616518">"Plavání"</item>
-    <item msgid="2666922823253345958">"Osoba na túře"</item>
-    <item msgid="8234880356472211396">"Osoba házející míč"</item>
-    <item msgid="4642980625253001443">"Kopající osoba"</item>
-    <item msgid="4324795269518833500">"Herní ovladač"</item>
-    <item msgid="7789966425125441125">"Malířova paleta"</item>
-    <item msgid="663512680597461570">"Sněhová vločka"</item>
-    <item msgid="7952183800501346803">"Plážový slunečník"</item>
-    <item msgid="799139025758265891">"Dílenské nástroje"</item>
-    <item msgid="1330084588359129896">"Stan"</item>
-    <item msgid="3861584909935022342">"Filmový pás"</item>
-    <item msgid="5827426100157335512">"Kniha"</item>
-    <item msgid="8585828346253128384">"Lotosový květ"</item>
-    <item msgid="8788370542815300188">"Lidská mysl"</item>
-    <item msgid="7287354964767553293">"Sluchátka"</item>
-    <item msgid="2530059623783800987">"Televize"</item>
-    <item msgid="5307182323469376758">"Vlak"</item>
-    <item msgid="4903790544026923026">"Auto"</item>
-    <item msgid="5010405583912314582">"Vidlička a nůž"</item>
-    <item msgid="8939998598599064900">"Nákupní košík"</item>
-    <item msgid="3379605903308731893">"Dítě"</item>
-    <item msgid="7808668968550293112">"Tlapa zvířete"</item>
-    <item msgid="1000692647524056504">"Hvězdička"</item>
-    <item msgid="8270261073421676502">"Dva lidé"</item>
-    <item msgid="5767782819651505460">"Hvězda"</item>
-    <item msgid="4368451291862729334">"Srdíčko"</item>
-    <item msgid="2613199102208419986">"Dům"</item>
-    <item msgid="3022279986430275040">"Půlměsíc"</item>
-    <item msgid="5421089790869483206">"Hodiny"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index b3a90de..6bfe729 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Nastavit automaticky pomocí sítě a bezdrátových signálů"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Automatické časové pásmo"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Nastavit automaticky podle mobilních sítí v okolí"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Nastavit automaticky podle polohy zařízení (pokud je k dispozici). Může být potřeba aktivní Wi-Fi."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Používat výchozí nastavení jazyka"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Používat 24hodinový formát"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Čas"</string>
@@ -1958,6 +1959,10 @@
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Místo držení více kláves aktivujte zkratky postupným tisknutím jednotlivých kláves"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Klávesy pro myš"</string>
     <string name="mouse_keys_summary" msgid="7030731235143286467">"Ukazatel můžete ovládat pomocí klávesnice"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Opačné posouvání myší"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Při posunutí nahoru posunout stránku dolů"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Prohodit levé a pravé tlačítko"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Používat levé tlačítko myši jako pravé"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Klávesové zkratky"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Zobrazit seznam zkratek"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Klávesnice a nástroje v pracovním profilu"</string>
@@ -2026,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Vyberte novou klávesu pro <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Přístupnost na fyzické klávesnici"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Funkce Jedním prstem, klávesy pro opuštění, klávesy pro myš"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Rozvržení <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Výchozí"</string>
@@ -2434,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Náhled"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standardní možnosti"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Jazyk"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Velikost titulků"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Styl titulků"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Vlastní možnosti"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Barva pozadí"</string>
@@ -2979,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Odpojit tuto síť VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Odpojit"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Verze"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Zapomenout VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Nahradit stávající síť VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Nastavit trvalou síť VPN?"</string>
@@ -5461,4 +5471,8 @@
     <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kontakty se ve výchozím nastavení uloží do zařízení a synchronizují s účtem"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Žádné výchozí nastavení"</string>
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Začněte tím, že přidáte účet"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
+    <skip />
 </resources>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index 1ff620f..0aba2de 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Mappe"</item>
-    <item msgid="184985872234062767">"Klassisk bygning"</item>
-    <item msgid="9189550412466785530">"Lejlighedskompleks"</item>
-    <item msgid="2142527562511049422">"Taleboble"</item>
-    <item msgid="2548100558260478605">"Gruppe af personer"</item>
-    <item msgid="2270003903304578284">"Lyspære"</item>
-    <item msgid="4793496619091161864">"Kalender"</item>
-    <item msgid="5673625795644364100">"Forstyr ikke"</item>
-    <item msgid="1423820834865831361">"Person, der løber"</item>
-    <item msgid="2037298830718732608">"Golf"</item>
-    <item msgid="2197835014443491074">"Håndvægt"</item>
-    <item msgid="2730180105015616518">"Svømning"</item>
-    <item msgid="2666922823253345958">"Person på vandretur"</item>
-    <item msgid="8234880356472211396">"Person, der kaster en bold"</item>
-    <item msgid="4642980625253001443">"Person, der sparker"</item>
-    <item msgid="4324795269518833500">"Spilcontroller"</item>
-    <item msgid="7789966425125441125">"Malerpalet"</item>
-    <item msgid="663512680597461570">"Snefnug"</item>
-    <item msgid="7952183800501346803">"Parasol"</item>
-    <item msgid="799139025758265891">"Værktøj"</item>
-    <item msgid="1330084588359129896">"Telt"</item>
-    <item msgid="3861584909935022342">"Filmspole"</item>
-    <item msgid="5827426100157335512">"Bog"</item>
-    <item msgid="8585828346253128384">"Lotusblomst"</item>
-    <item msgid="8788370542815300188">"En persons sind"</item>
-    <item msgid="7287354964767553293">"Høretelefoner"</item>
-    <item msgid="2530059623783800987">"Fjernsyn"</item>
-    <item msgid="5307182323469376758">"Tog"</item>
-    <item msgid="4903790544026923026">"Bil"</item>
-    <item msgid="5010405583912314582">"Kniv og gaffel"</item>
-    <item msgid="8939998598599064900">"Kurv"</item>
-    <item msgid="3379605903308731893">"Barn"</item>
-    <item msgid="7808668968550293112">"Dyrepote"</item>
-    <item msgid="1000692647524056504">"Stjernebadge"</item>
-    <item msgid="8270261073421676502">"To personer"</item>
-    <item msgid="5767782819651505460">"Stjerne"</item>
-    <item msgid="4368451291862729334">"Hjerte"</item>
-    <item msgid="2613199102208419986">"Hus"</item>
-    <item msgid="3022279986430275040">"Halvmåne"</item>
-    <item msgid="5421089790869483206">"Ur"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 5fc8b0b..797c328 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Indstil automatisk ved hjælp af dit netværk og trådløse signaler"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Automatisk tidszone"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Indstil automatisk baseret på mobilnetværk i nærheden af dig"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Indstil automatisk ved hjælp af din enhedslokation, hvis den er tilgængelig. En aktiv Wi-Fi-forbindelse kan også være påkrævet."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Brug landestandard"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Brug 24-timers format"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Klokkeslæt"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Hjælpefunktioner"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Fysisk tastatur"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Elastiktaster"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Tastaturet ignorerer gentagende, hurtige tryk på den samme tast"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Grænse for elastiktaster"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Vælg, hvor lang tid dit tastatur skal ignorere gentagne tastetryk"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2 sekunder"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4 sekunder"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0,6 sekunder"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Langsomtaster"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Justerer den tid, det tager, før et tastetryk aktiveres"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Træge taster"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Tryk på én tast ad gangen for at bruge genveje i stedet for at holde flere taster nede på samme tid"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Musetaster"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Brug dit tastatur til at styre markøren"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Omvendt rulning på mus"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Rul opad for at gå ned på siden"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Byt om på knapperne (venstre og højre)"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Brug venstre museknap som højre"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Tastaturgenveje"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Vis liste over genveje"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Tastatur og værktøjer for arbejdsprofil"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Vælg en ny ændringstast til <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Hjælpefunktioner til fysisk tastatur"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Træge taster, elastiktaster, musetaster"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g>-layout"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Standard"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Forhåndsvisning"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standardindstillinger"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Sprog"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Underteksternes størrelse"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Underteksttype"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Tilpassede valgmuligheder"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Baggrundsfarve"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Vil du afbryde dette VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Afbryd forbindelse"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Version"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Glem VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Erstat det eksisterende VPN-netværk?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Vil du konfigurere konstant VPN?"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Søg i Indstillinger"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"kontakter, lagerplads, konto"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Lagerplads for kontakter"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Kun via GPS"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Nye kontakter synkroniseres ikke med en konto"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kontakter gemmes på din enhed og synkroniseres med din konto som standard"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Der er ikke angivet nogen standardkonto"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Tilføj en konto for at komme godt i gang"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index fd23c5b..1fde6ab 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Aktentasche"</item>
-    <item msgid="184985872234062767">"Klassisches Gebäude"</item>
-    <item msgid="9189550412466785530">"Apartmenthaus"</item>
-    <item msgid="2142527562511049422">"Sprechblase"</item>
-    <item msgid="2548100558260478605">"Gruppe von Menschen"</item>
-    <item msgid="2270003903304578284">"Glühbirne"</item>
-    <item msgid="4793496619091161864">"Kalender"</item>
-    <item msgid="5673625795644364100">"Bitte nicht stören"</item>
-    <item msgid="1423820834865831361">"Person, die läuft"</item>
-    <item msgid="2037298830718732608">"Golf"</item>
-    <item msgid="2197835014443491074">"Fitnessstudio-Hantel"</item>
-    <item msgid="2730180105015616518">"Schwimmen"</item>
-    <item msgid="2666922823253345958">"Person, die wandert"</item>
-    <item msgid="8234880356472211396">"Person, die einen Ball wirft"</item>
-    <item msgid="4642980625253001443">"Person, die kickt"</item>
-    <item msgid="4324795269518833500">"Controller"</item>
-    <item msgid="7789966425125441125">"Farbpalette eines Künstlers"</item>
-    <item msgid="663512680597461570">"Schneeflocke"</item>
-    <item msgid="7952183800501346803">"Sonnenschirm"</item>
-    <item msgid="799139025758265891">"Workshop-Tools"</item>
-    <item msgid="1330084588359129896">"Zelt"</item>
-    <item msgid="3861584909935022342">"70er-Jahre-Film"</item>
-    <item msgid="5827426100157335512">"Buch"</item>
-    <item msgid="8585828346253128384">"Lotusblume"</item>
-    <item msgid="8788370542815300188">"Die Gedanken einer Person"</item>
-    <item msgid="7287354964767553293">"Kopfhörer"</item>
-    <item msgid="2530059623783800987">"Fernseher"</item>
-    <item msgid="5307182323469376758">"Zug"</item>
-    <item msgid="4903790544026923026">"Auto"</item>
-    <item msgid="5010405583912314582">"Messer und Gabel"</item>
-    <item msgid="8939998598599064900">"Einkaufswagen"</item>
-    <item msgid="3379605903308731893">"Kind"</item>
-    <item msgid="7808668968550293112">"Tierpfote"</item>
-    <item msgid="1000692647524056504">"Sternsymbol"</item>
-    <item msgid="8270261073421676502">"Zwei Personen"</item>
-    <item msgid="5767782819651505460">"Stern"</item>
-    <item msgid="4368451291862729334">"Herz"</item>
-    <item msgid="2613199102208419986">"Haus"</item>
-    <item msgid="3022279986430275040">"Halbmond"</item>
-    <item msgid="5421089790869483206">"Uhr"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index f2129a6..35a8155 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Einstellung erfolgt automatisch über Netzwerk- und WLAN-Signale"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Zeitzone automatisch einstellen"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Einstellung erfolgt automatisch auf der Grundlage von Mobilfunknetzen in deiner Nähe"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Einstellung erfolgt automatisch anhand des Gerätestandorts, wenn verfügbar. Eventuell ist auch eine aktive WLAN-Verbindung nötig."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Standardformat für die gewählte Spracheinstellung verwenden"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-Stunden-Format"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Uhrzeit"</string>
@@ -659,12 +660,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Muster für vertrauliches Profil einrichten"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Sperren"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Verbergen"</string>
-    <!-- no translation found for private_space_confirm_your_pattern_header (449382220134788771) -->
-    <skip />
-    <!-- no translation found for private_space_confirm_your_pin_header (4543332157470087796) -->
-    <skip />
-    <!-- no translation found for private_space_confirm_your_password_header (9202308075814307169) -->
-    <skip />
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Muster für vertrauliches Profil bestätigen"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"PIN für vertrauliches Profil noch einmal eingeben"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Passwort für vertrauliches Profil noch einmal eingeben"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Du kannst bis zu <xliff:g id="COUNT">%d</xliff:g> Fingerabdrücke hinzufügen."</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Du hast die maximale Anzahl an Fingerabdrücken hinzugefügt"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Es können keine Fingerabdrücke mehr hinzugefügt werden"</string>
@@ -1032,10 +1030,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Prüfe das Passwort und versuch es noch einmal"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Wende dich an den Hersteller des Geräts"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Prüfe die Verbindung und versuche es noch einmal"</string>
-    <!-- no translation found for wifi_dpp_check_connection_no_matched_ssid (3608318690698685427) -->
-    <skip />
-    <!-- no translation found for wifi_dpp_check_connection_no_matched_security (1462706753123341376) -->
-    <skip />
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Dieses WLAN ist momentan nicht verfügbar"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Es gibt ein Problem mit diesem QR‑Code. Versuche es mit einer anderen Methode."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Netzwerk auswählen"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Wenn du dein Gerät verbinden möchtest, wähle ein Netzwerk"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Dieses Gerät zu \"<xliff:g id="SSID">%1$s</xliff:g>\" hinzufügen?"</string>
@@ -1951,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Barrierefreiheit"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Physische Tastatur"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Bounce-Tasten"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Schnell aufeinanderfolgende Betätigungen derselben Taste auf der Tastatur werden ignoriert"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Grenzwert für Bounce-Tasten"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Wähle aus, wie lange wiederholtes Drücken der Tasten auf der Tastatur ignoriert werden soll"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2 Sek."</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4 Sek."</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0,6 Sek."</string>
     <string name="slow_keys" msgid="2891452895499690837">"Anschlagverzögerung"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Passt die Zeit an, die eine Taste gedrückt werden muss, um sie zu aktivieren"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Einfingerbedienung"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Bei Tastenkombinationen Tasten einzeln drücken, statt sie zusammen gedrückt zu halten"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Maustasten"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Zum Steuern des Mauszeigers die Tastatur verwenden"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Mausrad-Scrollrichtung umkehren"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Wenn du nach oben scrollst, wird die Seite nach unten verschoben"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Linke und rechte Taste tauschen"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Die linke Maustaste übernimmt die Funktion der rechten Maustaste (und umgekehrt)"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Tastenkürzel"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Liste der Tastenkombinationen anzeigen"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Tastaturen und Tools für das Arbeitsprofil"</string>
@@ -2039,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Wähle eine neue Taste für <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Bedienungshilfen für physische Tastaturen"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Einfingerbedienung, Bounce-Tasten, Maustasten"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Layout: <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Standard"</string>
@@ -2447,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Vorschau"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standardoptionen"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Sprache"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Größe der Untertitel"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Untertitelstil"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Benutzerdefinierte Optionen"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Hintergrundfarbe"</string>
@@ -2992,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Verbindung zu diesem VPN trennen?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Verbindung trennen"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Version"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN entfernen"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Aktuelles VPN ersetzen?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Durchgehend aktives VPN aktivieren?"</string>
@@ -3924,8 +3921,7 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Modus erstellen"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Benutzerdefinierter Modus"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Modusname"</string>
-    <!-- no translation found for zen_mode_edit_name_empty_error (5788063278827188275) -->
-    <skip />
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Der Name des Modus darf nicht leer sein"</string>
     <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Symbol auswählen"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Kalendertermine"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Ablauf „Schlafenszeit“"</string>
@@ -5468,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"In Einstellungen suchen"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"Kontakte, Speicher, Konto"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Kontakte-Speicher"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Nur Gerät"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Neue Kontakte werden nicht mit einem Konto synchronisiert"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kontakte werden standardmäßig auf deinem Gerät gespeichert und mit deinem Konto synchronisiert"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Kein Standard festgelegt"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Füge ein Konto hinzu, um loszulegen"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index 2bad60e..404fd18 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Χαρτοφύλακας"</item>
-    <item msgid="184985872234062767">"Κλασικό κτίριο"</item>
-    <item msgid="9189550412466785530">"Πολυκατοικία"</item>
-    <item msgid="2142527562511049422">"Συννεφάκι ομιλίας"</item>
-    <item msgid="2548100558260478605">"Ομάδα ανθρώπων"</item>
-    <item msgid="2270003903304578284">"Λαμπτήρας"</item>
-    <item msgid="4793496619091161864">"Ημερολόγιο"</item>
-    <item msgid="5673625795644364100">"Μην ενοχλείτε"</item>
-    <item msgid="1423820834865831361">"Άτομο που τρέχει"</item>
-    <item msgid="2037298830718732608">"Γκολφ"</item>
-    <item msgid="2197835014443491074">"Αλτήρας γυμναστικής"</item>
-    <item msgid="2730180105015616518">"Κολύμβηση"</item>
-    <item msgid="2666922823253345958">"Άτομο που κάνει πεζοπορία"</item>
-    <item msgid="8234880356472211396">"Άτομο που ρίχνει μπάλα"</item>
-    <item msgid="4642980625253001443">"Άτομο που κλωτσά"</item>
-    <item msgid="4324795269518833500">"Χειριστήριο παιχνιδιού"</item>
-    <item msgid="7789966425125441125">"Παλέτα χρωμάτων καλλιτέχνη"</item>
-    <item msgid="663512680597461570">"Νιφάδα χιονιού"</item>
-    <item msgid="7952183800501346803">"Ομπρέλα παραλίας"</item>
-    <item msgid="799139025758265891">"Εργαλεία εργαστηρίου"</item>
-    <item msgid="1330084588359129896">"Σκηνή"</item>
-    <item msgid="3861584909935022342">"Ρετρό φιλμ"</item>
-    <item msgid="5827426100157335512">"Βιβλίο"</item>
-    <item msgid="8585828346253128384">"Λουλούδι λωτού"</item>
-    <item msgid="8788370542815300188">"Ανθρώπινος εγκέφαλος"</item>
-    <item msgid="7287354964767553293">"Ακουστικά"</item>
-    <item msgid="2530059623783800987">"Τηλεόραση"</item>
-    <item msgid="5307182323469376758">"Τρένο"</item>
-    <item msgid="4903790544026923026">"Αυτοκίνητο"</item>
-    <item msgid="5010405583912314582">"Πιρούνι και μαχαίρι"</item>
-    <item msgid="8939998598599064900">"Καλάθι αγορών"</item>
-    <item msgid="3379605903308731893">"Παιδί"</item>
-    <item msgid="7808668968550293112">"Πατούσα ζώου"</item>
-    <item msgid="1000692647524056504">"Σήμα με αστέρι"</item>
-    <item msgid="8270261073421676502">"Δύο άτομα"</item>
-    <item msgid="5767782819651505460">"Αστέρι"</item>
-    <item msgid="4368451291862729334">"Καρδιά"</item>
-    <item msgid="2613199102208419986">"Σπίτι"</item>
-    <item msgid="3022279986430275040">"Μισοφέγγαρο"</item>
-    <item msgid="5421089790869483206">"Ρολόι"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 56ab7f6..658955b 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Αυτόματος ορισμός με χρήση του δικτύου σας και των ασύρματων σημάτων"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Αυτόματη ζώνη ώρας"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Αυτόματος ορισμός με βάση τα δίκτυα κινητής τηλεφωνίας κοντά σας"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Ορίστε αυτόματα με την τοποθεσία συσκευής, αν είναι διαθέσιμη. Ίσως απαιτείται ενεργή σύνδεση Wi-Fi."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Χρήση προεπιλογής τοπικών ρυθμίσεων"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Χρήση μορφής 24ώρου"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Ώρα"</string>
@@ -1958,6 +1959,10 @@
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Για τις συντομεύσεις, αντί να πατάτε παρατεταμένα όλα τα κουμπιά μαζί, φροντίστε να πατάτε ένα πλήκτρο κάθε φορά"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Πλήκτρα ποντικιού"</string>
     <string name="mouse_keys_summary" msgid="7030731235143286467">"Χρησιμοποιήστε το πληκτρολόγιο, για να ελέγξετε τον δείκτη"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Αντίστροφη κύλιση με το ποντίκι"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Κάντε κύλιση προς τα επάνω, για να μετακινήσετε τη σελίδα προς τα κάτω."</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Εναλλαγή αριστερού και δεξιού κουμπιού"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Χρησιμοποιήστε το αριστερό κουμπί του ποντικιού ως δεξί κουμπί"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Συντομεύσεις πληκτρολογίου"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Εμφάνιση λίστας συντομεύσεων"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Πληκτρολόγιο και εργαλεία προφίλ εργασίας"</string>
@@ -2026,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Επιλέξτε ένα νέο κλειδί για <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Προσβασιμότητα φυσικού πληκτρολογίου"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Ασύγχρονα πλήκτρα, Ελαστικά πλήκτρα, Πλήκτρα ποντικιού"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Διάταξη <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Προεπιλογή"</string>
@@ -2434,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Προεπισκόπηση"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Βασικές επιλογές"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Γλώσσα"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Μέγεθος υπότιτλων"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Στιλ υποτίτλων"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Προσαρμοσμένες επιλογές"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Χρώμα φόντου"</string>
@@ -2979,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Να αποσυνδεθεί αυτό το VPN;"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Αποσύνδεση"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Έκδοση"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Διαγραφή VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Αντικατάσταση υπάρχοντος VPN;"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Ενεργοποίηση του μονίμως ενεργού VPN;"</string>
@@ -5459,4 +5469,8 @@
     <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Οι επαφές θα αποθηκεύονται στη συσκευή σας και θα συγχρονίζονται με τον λογαριασμό σας από προεπιλογή"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Δεν ορίστηκε προεπιλογή"</string>
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Για να ξεκινήσετε, προσθέστε λογαριασμό"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rAU/arrays.xml b/res/values-en-rAU/arrays.xml
index 53465e7..85c9cc8 100644
--- a/res/values-en-rAU/arrays.xml
+++ b/res/values-en-rAU/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Briefcase"</item>
-    <item msgid="184985872234062767">"Classical building"</item>
-    <item msgid="9189550412466785530">"Flats"</item>
-    <item msgid="2142527562511049422">"Speech bubble"</item>
-    <item msgid="2548100558260478605">"Group of people"</item>
-    <item msgid="2270003903304578284">"Light bulb"</item>
-    <item msgid="4793496619091161864">"Calendar"</item>
-    <item msgid="5673625795644364100">"Do Not Disturb"</item>
-    <item msgid="1423820834865831361">"Person running"</item>
-    <item msgid="2037298830718732608">"Golf"</item>
-    <item msgid="2197835014443491074">"Gym dumbbell"</item>
-    <item msgid="2730180105015616518">"Swimming"</item>
-    <item msgid="2666922823253345958">"Person hiking"</item>
-    <item msgid="8234880356472211396">"Person throwing a ball"</item>
-    <item msgid="4642980625253001443">"Person kicking"</item>
-    <item msgid="4324795269518833500">"Game controller"</item>
-    <item msgid="7789966425125441125">"Artist colour palette"</item>
-    <item msgid="663512680597461570">"Snowflake"</item>
-    <item msgid="7952183800501346803">"Beach umbrella"</item>
-    <item msgid="799139025758265891">"Workshop tools"</item>
-    <item msgid="1330084588359129896">"Tent"</item>
-    <item msgid="3861584909935022342">"Film reel"</item>
-    <item msgid="5827426100157335512">"Book"</item>
-    <item msgid="8585828346253128384">"Lotus flower"</item>
-    <item msgid="8788370542815300188">"Person\'s mind"</item>
-    <item msgid="7287354964767553293">"Headphones"</item>
-    <item msgid="2530059623783800987">"TV"</item>
-    <item msgid="5307182323469376758">"Train"</item>
-    <item msgid="4903790544026923026">"Car"</item>
-    <item msgid="5010405583912314582">"Fork and knife"</item>
-    <item msgid="8939998598599064900">"Shopping basket"</item>
-    <item msgid="3379605903308731893">"Child"</item>
-    <item msgid="7808668968550293112">"Animal paw"</item>
-    <item msgid="1000692647524056504">"Star badge"</item>
-    <item msgid="8270261073421676502">"Two people"</item>
-    <item msgid="5767782819651505460">"Star"</item>
-    <item msgid="4368451291862729334">"Heart"</item>
-    <item msgid="2613199102208419986">"House"</item>
-    <item msgid="3022279986430275040">"Half-moon"</item>
-    <item msgid="5421089790869483206">"Clock"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index ef44048..64e1eec 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Set automatically using your network and wireless signals"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Automatic time zone"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Set automatically based on mobile networks near you"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Set automatically using your device location, if available. An active Wi-Fi connection may also be required."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Use locale default"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Use 24-hour format"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Time"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Accessibility"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Physical keyboard"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Bounce keys"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"The keyboard ignores quickly repeated presses of the same key"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Bounce key threshold"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Choose the duration of time that your keyboard ignores repeated key presses"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0.2s"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0.4s"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0.6s"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Slow keys"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Adjusts the time that it takes for a key press to activate"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Sticky keys"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Press one key at a time for shortcuts instead of holding keys down together"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Mouse keys"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Use your keyboard to control the pointer"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Mouse reverse scrolling"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Scroll up to move the page down"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Swap left and right buttons"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Use the left mouse button as your right"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Keyboard shortcuts"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Show list of shortcuts"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Work profile keyboards &amp; tools"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Choose a new key for <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Physical keyboard accessibility"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Sticky keys, bounce keys, mouse keys"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> layout"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Default"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Preview"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standard options"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Language"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Caption size"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Caption style"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Customisation options"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Background colour"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Disconnect this VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Disconnect"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Version"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Forget VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Replace existing VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Set always-on VPN?"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Search settings"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"contacts, storage, account"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Contacts storage"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Device only"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"New contacts won\'t be synced with an account"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Contacts will be saved to your device and synced to your account by default"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"No default set"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Add an account to get started"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-en-rCA/arrays.xml b/res/values-en-rCA/arrays.xml
index 4682432..19cf1b9 100644
--- a/res/values-en-rCA/arrays.xml
+++ b/res/values-en-rCA/arrays.xml
@@ -519,7 +519,7 @@
     <item msgid="663512680597461570">"Snowflake"</item>
     <item msgid="7952183800501346803">"Beach umbrella"</item>
     <item msgid="799139025758265891">"Workshop tools"</item>
-    <item msgid="1330084588359129896">"Tent"</item>
+    <item msgid="8112685757657659269">"Piano"</item>
     <item msgid="3861584909935022342">"Film reel"</item>
     <item msgid="5827426100157335512">"Book"</item>
     <item msgid="8585828346253128384">"Lotus flower"</item>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index a1ab150..74b459e 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -250,7 +250,7 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Set automatically using your network and wireless signals"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Automatic time zone"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Set automatically based on mobile networks near you"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Set automatically using your device location, if available. An active Wifi connection may also be required."</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Set automatically using your device location, if available"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Use locale default"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Use 24-hour format"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Time"</string>
@@ -1958,6 +1958,10 @@
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Press one key at a time for shortcuts instead of holding keys down together"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Mouse keys"</string>
     <string name="mouse_keys_summary" msgid="7030731235143286467">"Use your keyboard to control the pointer"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Mouse reverse scrolling"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Scroll up to move the page down"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Swap left and right buttons"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Use the left mouse button as your right"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Keyboard shortcuts"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Show list of shortcuts"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Work profile keyboards &amp; tools"</string>
@@ -2026,8 +2030,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Choose a new key for <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Physical keyboard accessibility"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Sticky keys, Bounce keys, Mouse keys"</string>
-    <string name="keyboard_repeat_key_title" msgid="3641350808120194549">"Repeat Keys"</string>
-    <string name="keyboard_repeat_key_summary" msgid="3970350989341158854">"Hold down a key to repeat its character until the key is released"</string>
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Repeat Keys"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Delay before repeat"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Repeat Rate"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Hold down a key to repeat its character until the key is released"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> layout"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Default"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automatic: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2976,6 +2982,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Disconnect this VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Disconnect"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Version"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Version <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Forget VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Replace existing VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Set always-on VPN?"</string>
@@ -5456,4 +5463,6 @@
     <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Contacts will be saved to your device and synced to your account by default"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"No default set"</string>
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Add an account to get started"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Circle to Search"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Touch and hold the Home button or the navigation handle to search using the content on your screen."</string>
 </resources>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 53465e7..85c9cc8 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Briefcase"</item>
-    <item msgid="184985872234062767">"Classical building"</item>
-    <item msgid="9189550412466785530">"Flats"</item>
-    <item msgid="2142527562511049422">"Speech bubble"</item>
-    <item msgid="2548100558260478605">"Group of people"</item>
-    <item msgid="2270003903304578284">"Light bulb"</item>
-    <item msgid="4793496619091161864">"Calendar"</item>
-    <item msgid="5673625795644364100">"Do Not Disturb"</item>
-    <item msgid="1423820834865831361">"Person running"</item>
-    <item msgid="2037298830718732608">"Golf"</item>
-    <item msgid="2197835014443491074">"Gym dumbbell"</item>
-    <item msgid="2730180105015616518">"Swimming"</item>
-    <item msgid="2666922823253345958">"Person hiking"</item>
-    <item msgid="8234880356472211396">"Person throwing a ball"</item>
-    <item msgid="4642980625253001443">"Person kicking"</item>
-    <item msgid="4324795269518833500">"Game controller"</item>
-    <item msgid="7789966425125441125">"Artist colour palette"</item>
-    <item msgid="663512680597461570">"Snowflake"</item>
-    <item msgid="7952183800501346803">"Beach umbrella"</item>
-    <item msgid="799139025758265891">"Workshop tools"</item>
-    <item msgid="1330084588359129896">"Tent"</item>
-    <item msgid="3861584909935022342">"Film reel"</item>
-    <item msgid="5827426100157335512">"Book"</item>
-    <item msgid="8585828346253128384">"Lotus flower"</item>
-    <item msgid="8788370542815300188">"Person\'s mind"</item>
-    <item msgid="7287354964767553293">"Headphones"</item>
-    <item msgid="2530059623783800987">"TV"</item>
-    <item msgid="5307182323469376758">"Train"</item>
-    <item msgid="4903790544026923026">"Car"</item>
-    <item msgid="5010405583912314582">"Fork and knife"</item>
-    <item msgid="8939998598599064900">"Shopping basket"</item>
-    <item msgid="3379605903308731893">"Child"</item>
-    <item msgid="7808668968550293112">"Animal paw"</item>
-    <item msgid="1000692647524056504">"Star badge"</item>
-    <item msgid="8270261073421676502">"Two people"</item>
-    <item msgid="5767782819651505460">"Star"</item>
-    <item msgid="4368451291862729334">"Heart"</item>
-    <item msgid="2613199102208419986">"House"</item>
-    <item msgid="3022279986430275040">"Half-moon"</item>
-    <item msgid="5421089790869483206">"Clock"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 0f428c2..05a463d 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Set automatically using your network and wireless signals"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Automatic time zone"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Set automatically based on mobile networks near you"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Set automatically using your device location, if available. An active Wi-Fi connection may also be required."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Use locale default"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Use 24-hour format"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Time"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Accessibility"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Physical keyboard"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Bounce keys"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"The keyboard ignores quickly repeated presses of the same key"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Bounce key threshold"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Choose the duration of time that your keyboard ignores repeated key presses"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0.2s"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0.4s"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0.6s"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Slow keys"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Adjusts the time that it takes for a key press to activate"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Sticky keys"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Press one key at a time for shortcuts instead of holding keys down together"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Mouse keys"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Use your keyboard to control the pointer"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Mouse reverse scrolling"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Scroll up to move the page down"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Swap left and right buttons"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Use the left mouse button as your right"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Keyboard shortcuts"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Show list of shortcuts"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Work profile keyboards &amp; tools"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Choose a new key for <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Physical keyboard accessibility"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Sticky keys, bounce keys, mouse keys"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> layout"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Default"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Preview"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standard options"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Language"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Caption size"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Caption style"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Customisation options"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Background colour"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Disconnect this VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Disconnect"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Version"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Forget VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Replace existing VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Set always-on VPN?"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Search settings"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"contacts, storage, account"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Contacts storage"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Device only"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"New contacts won\'t be synced with an account"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Contacts will be saved to your device and synced to your account by default"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"No default set"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Add an account to get started"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-en-rIN/arrays.xml b/res/values-en-rIN/arrays.xml
index 53465e7..85c9cc8 100644
--- a/res/values-en-rIN/arrays.xml
+++ b/res/values-en-rIN/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Briefcase"</item>
-    <item msgid="184985872234062767">"Classical building"</item>
-    <item msgid="9189550412466785530">"Flats"</item>
-    <item msgid="2142527562511049422">"Speech bubble"</item>
-    <item msgid="2548100558260478605">"Group of people"</item>
-    <item msgid="2270003903304578284">"Light bulb"</item>
-    <item msgid="4793496619091161864">"Calendar"</item>
-    <item msgid="5673625795644364100">"Do Not Disturb"</item>
-    <item msgid="1423820834865831361">"Person running"</item>
-    <item msgid="2037298830718732608">"Golf"</item>
-    <item msgid="2197835014443491074">"Gym dumbbell"</item>
-    <item msgid="2730180105015616518">"Swimming"</item>
-    <item msgid="2666922823253345958">"Person hiking"</item>
-    <item msgid="8234880356472211396">"Person throwing a ball"</item>
-    <item msgid="4642980625253001443">"Person kicking"</item>
-    <item msgid="4324795269518833500">"Game controller"</item>
-    <item msgid="7789966425125441125">"Artist colour palette"</item>
-    <item msgid="663512680597461570">"Snowflake"</item>
-    <item msgid="7952183800501346803">"Beach umbrella"</item>
-    <item msgid="799139025758265891">"Workshop tools"</item>
-    <item msgid="1330084588359129896">"Tent"</item>
-    <item msgid="3861584909935022342">"Film reel"</item>
-    <item msgid="5827426100157335512">"Book"</item>
-    <item msgid="8585828346253128384">"Lotus flower"</item>
-    <item msgid="8788370542815300188">"Person\'s mind"</item>
-    <item msgid="7287354964767553293">"Headphones"</item>
-    <item msgid="2530059623783800987">"TV"</item>
-    <item msgid="5307182323469376758">"Train"</item>
-    <item msgid="4903790544026923026">"Car"</item>
-    <item msgid="5010405583912314582">"Fork and knife"</item>
-    <item msgid="8939998598599064900">"Shopping basket"</item>
-    <item msgid="3379605903308731893">"Child"</item>
-    <item msgid="7808668968550293112">"Animal paw"</item>
-    <item msgid="1000692647524056504">"Star badge"</item>
-    <item msgid="8270261073421676502">"Two people"</item>
-    <item msgid="5767782819651505460">"Star"</item>
-    <item msgid="4368451291862729334">"Heart"</item>
-    <item msgid="2613199102208419986">"House"</item>
-    <item msgid="3022279986430275040">"Half-moon"</item>
-    <item msgid="5421089790869483206">"Clock"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 606547b..9ca1e24 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Set automatically using your network and wireless signals"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Automatic time zone"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Set automatically based on mobile networks near you"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Set automatically using your device location, if available. An active Wi-Fi connection may also be required."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Use locale default"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Use 24-hour format"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Time"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Accessibility"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Physical keyboard"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Bounce keys"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"The keyboard ignores quickly repeated presses of the same key"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Bounce key threshold"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Choose the duration of time that your keyboard ignores repeated key presses"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0.2s"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0.4s"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0.6s"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Slow keys"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Adjusts the time that it takes for a key press to activate"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Sticky keys"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Press one key at a time for shortcuts instead of holding keys down together"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Mouse keys"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Use your keyboard to control the pointer"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Mouse reverse scrolling"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Scroll up to move the page down"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Swap left and right buttons"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Use the left mouse button as your right"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Keyboard shortcuts"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Show list of shortcuts"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Work profile keyboards &amp; tools"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Choose a new key for <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Physical keyboard accessibility"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Sticky keys, bounce keys, mouse keys"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> layout"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Default"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Preview"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standard options"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Language"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Caption size"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Caption style"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Customisation options"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Background colour"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Disconnect this VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Disconnect"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Version"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Forget VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Replace existing VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Set always-on VPN?"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Search settings"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"contacts, storage, account"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Contacts storage"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Device only"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"New contacts won\'t be synced with an account"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Contacts will be saved to your device and synced to your account by default"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"No default set"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Add an account to get started"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 607d9d7..e5178b0 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Maletín"</item>
-    <item msgid="184985872234062767">"Edificio clásico"</item>
-    <item msgid="9189550412466785530">"Edificio de apartamentos"</item>
-    <item msgid="2142527562511049422">"Globo de diálogo"</item>
-    <item msgid="2548100558260478605">"Grupo de personas"</item>
-    <item msgid="2270003903304578284">"Bombilla"</item>
-    <item msgid="4793496619091161864">"Calendario"</item>
-    <item msgid="5673625795644364100">"No interrumpir"</item>
-    <item msgid="1423820834865831361">"Persona corriendo"</item>
-    <item msgid="2037298830718732608">"Golf"</item>
-    <item msgid="2197835014443491074">"Mancuerna"</item>
-    <item msgid="2730180105015616518">"Natación"</item>
-    <item msgid="2666922823253345958">"Persona caminando"</item>
-    <item msgid="8234880356472211396">"Persona arrojando una pelota"</item>
-    <item msgid="4642980625253001443">"Persona pateando"</item>
-    <item msgid="4324795269518833500">"Control de juegos"</item>
-    <item msgid="7789966425125441125">"Paleta de colores del artista"</item>
-    <item msgid="663512680597461570">"Copo de nieve"</item>
-    <item msgid="7952183800501346803">"Sombrilla"</item>
-    <item msgid="799139025758265891">"Herramientas de taller"</item>
-    <item msgid="1330084588359129896">"Tienda"</item>
-    <item msgid="3861584909935022342">"Rollo de película"</item>
-    <item msgid="5827426100157335512">"Libro"</item>
-    <item msgid="8585828346253128384">"Flor de loto"</item>
-    <item msgid="8788370542815300188">"Mente de una persona"</item>
-    <item msgid="7287354964767553293">"Auriculares"</item>
-    <item msgid="2530059623783800987">"TV"</item>
-    <item msgid="5307182323469376758">"Tren"</item>
-    <item msgid="4903790544026923026">"Auto"</item>
-    <item msgid="5010405583912314582">"Tenedor y cuchillo"</item>
-    <item msgid="8939998598599064900">"Carrito de compras"</item>
-    <item msgid="3379605903308731893">"Niño"</item>
-    <item msgid="7808668968550293112">"Pata de animal"</item>
-    <item msgid="1000692647524056504">"Insignia de estrella"</item>
-    <item msgid="8270261073421676502">"Dos personas"</item>
-    <item msgid="5767782819651505460">"Estrella"</item>
-    <item msgid="4368451291862729334">"Corazón"</item>
-    <item msgid="2613199102208419986">"Casa"</item>
-    <item msgid="3022279986430275040">"Media luna"</item>
-    <item msgid="5421089790869483206">"Reloj"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index ce0820e..0ac1984 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Se establecen automáticamente con la red y las señales inalámbricas"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Zona horaria automática"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Configurar automáticamente según las redes móviles cercanas"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Se establecen automáticamente con la ubicación del dispositivo (si está disponible). Se podría necesitar una conexión Wi-Fi activa."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Usar configuración regional predeterminada"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Formato de 24 horas"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Hora"</string>
@@ -659,12 +660,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Establece patrón para espacio privado"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Bloqueo"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Ocultar"</string>
-    <!-- no translation found for private_space_confirm_your_pattern_header (449382220134788771) -->
-    <skip />
-    <!-- no translation found for private_space_confirm_your_pin_header (4543332157470087796) -->
-    <skip />
-    <!-- no translation found for private_space_confirm_your_password_header (9202308075814307169) -->
-    <skip />
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Confirma el patrón de tu espacio privado"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Vuelve a ingresar el PIN de tu espacio privado"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Vuelve a ingresar la contraseña de tu espacio privado"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Puedes agregar hasta <xliff:g id="COUNT">%d</xliff:g> huellas dactilares"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Agregaste la cantidad máxima permitida de huellas digitales"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"No se pueden agregar más huellas digitales"</string>
@@ -1032,10 +1030,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Revisa la contraseña y vuelve a intentarlo"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Comunícate con el fabricante del dispositivo"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Comprueba la conexión y vuelve a intentarlo"</string>
-    <!-- no translation found for wifi_dpp_check_connection_no_matched_ssid (3608318690698685427) -->
-    <skip />
-    <!-- no translation found for wifi_dpp_check_connection_no_matched_security (1462706753123341376) -->
-    <skip />
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Esta red Wi-Fi no está disponible en este momento"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Hay un problema con este código QR. Intenta conectarte de otra forma."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Elegir una red"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Selecciona una red para conectar tu dispositivo"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"¿Agregar este dispositivo a \"<xliff:g id="SSID">%1$s</xliff:g>\"?"</string>
@@ -1963,6 +1959,10 @@
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Presiona una tecla a la vez para hacer la combinación de teclas en lugar de presionarlas juntas"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Teclas del mouse"</string>
     <string name="mouse_keys_summary" msgid="7030731235143286467">"Usa el teclado para controlar el puntero"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Desplazamiento invertido del mouse"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Desplázate hacia arriba para bajar la página"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Intercambiar los botones izquierdo y derecho"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Usa el botón izquierdo del mouse como el derecho"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Combinaciones de teclas"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Mostrar lista de combinaciones de teclas"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Teclados y herramientas del perfil de trabajo"</string>
@@ -2031,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Elige una nueva tecla para <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Accesibilidad del teclado físico"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Teclas especiales, rechazo de teclas, teclas del mouse"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Diseño <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Predeterminadas"</string>
@@ -2439,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Vista previa"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Opciones estándar"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Idioma"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Tamaño de los subtítulos"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Estilo de los subtítulos"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Opciones personalizadas"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Color de fondo"</string>
@@ -2984,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"¿Deseas desconectar esta VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Desconectar"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versión"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Borrar VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"¿Reemplazar VPN existente?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"¿Configurar la VPN siempre activa?"</string>
@@ -3916,8 +3921,7 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Crea un modo"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Modo personalizado"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Nombre del modo"</string>
-    <!-- no translation found for zen_mode_edit_name_empty_error (5788063278827188275) -->
-    <skip />
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"El nombre del modo no puede estar vacío"</string>
     <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Selecciona un ícono"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Eventos de calendario"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Rutina Hora de dormir"</string>
@@ -5465,4 +5469,8 @@
     <string name="contacts_storage_selection_message" msgid="8082077300632059003">"De forma predeterminada, los contactos se guardarán en el dispositivo y se sincronizarán con tu cuenta"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"No hay cuenta predeterminada"</string>
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Agrega una cuenta para comenzar"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
+    <skip />
 </resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 2a48e62..6a2d714 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Maletín"</item>
-    <item msgid="184985872234062767">"Edificio clásico"</item>
-    <item msgid="9189550412466785530">"Edificio de apartamentos"</item>
-    <item msgid="2142527562511049422">"Bocadillo"</item>
-    <item msgid="2548100558260478605">"Grupo de personas"</item>
-    <item msgid="2270003903304578284">"Bombilla"</item>
-    <item msgid="4793496619091161864">"Calendario"</item>
-    <item msgid="5673625795644364100">"No molestar"</item>
-    <item msgid="1423820834865831361">"Persona corriendo"</item>
-    <item msgid="2037298830718732608">"Golf"</item>
-    <item msgid="2197835014443491074">"Mancuerna de gimnasio"</item>
-    <item msgid="2730180105015616518">"Natación"</item>
-    <item msgid="2666922823253345958">"Persona haciendo senderismo"</item>
-    <item msgid="8234880356472211396">"Persona lanzando una pelota"</item>
-    <item msgid="4642980625253001443">"Persona dando una patada"</item>
-    <item msgid="4324795269518833500">"Mandos de juegos"</item>
-    <item msgid="7789966425125441125">"Paleta de colores del artista"</item>
-    <item msgid="663512680597461570">"Copo de nieve"</item>
-    <item msgid="7952183800501346803">"Sombrilla"</item>
-    <item msgid="799139025758265891">"Herramientas del taller"</item>
-    <item msgid="1330084588359129896">"Tienda de campaña"</item>
-    <item msgid="3861584909935022342">"Carrete vintage"</item>
-    <item msgid="5827426100157335512">"Libro"</item>
-    <item msgid="8585828346253128384">"Flor de loto"</item>
-    <item msgid="8788370542815300188">"Mente de una persona"</item>
-    <item msgid="7287354964767553293">"Auriculares"</item>
-    <item msgid="2530059623783800987">"Televisión"</item>
-    <item msgid="5307182323469376758">"Tren"</item>
-    <item msgid="4903790544026923026">"Coche"</item>
-    <item msgid="5010405583912314582">"Cuchillo y tenedor"</item>
-    <item msgid="8939998598599064900">"Carrito de la compra"</item>
-    <item msgid="3379605903308731893">"Niño/a"</item>
-    <item msgid="7808668968550293112">"Pata de animal"</item>
-    <item msgid="1000692647524056504">"Insignia de estrella"</item>
-    <item msgid="8270261073421676502">"Dos personas"</item>
-    <item msgid="5767782819651505460">"Estrella"</item>
-    <item msgid="4368451291862729334">"Corazón"</item>
-    <item msgid="2613199102208419986">"Casa"</item>
-    <item msgid="3022279986430275040">"Media luna"</item>
-    <item msgid="5421089790869483206">"Reloj"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index ff50016..bb0dfe9 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Se establece automáticamente mediante tu red y señales inalámbricas"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Zona horaria automática"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Se establece automáticamente según las redes móviles cercanas"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Se establece automáticamente usando la ubicación de tu dispositivo, si está disponible. También puede que se necesite una conexión Wi-Fi activa."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Usar configuración regional predeterminada"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Usar formato de 24 horas"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Hora"</string>
@@ -659,12 +660,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Configura un patrón para espacio privado"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Bloquear"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Ocultar"</string>
-    <!-- no translation found for private_space_confirm_your_pattern_header (449382220134788771) -->
-    <skip />
-    <!-- no translation found for private_space_confirm_your_pin_header (4543332157470087796) -->
-    <skip />
-    <!-- no translation found for private_space_confirm_your_password_header (9202308075814307169) -->
-    <skip />
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Confirma el patrón del espacio privado"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Vuelve a introducir el PIN del espacio privado"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Vuelve a introducir la contraseña del espacio privado"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Puedes añadir hasta <xliff:g id="COUNT">%d</xliff:g> huellas digitales"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Has añadido el número máximo de huellas digitales"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"No se pueden añadir más huellas digitales"</string>
@@ -1032,10 +1030,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Comprueba que la contraseña sea correcta y vuelve a intentarlo"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Ponte en contacto con el fabricante del dispositivo"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Comprueba la conexión y vuelve a intentarlo"</string>
-    <!-- no translation found for wifi_dpp_check_connection_no_matched_ssid (3608318690698685427) -->
-    <skip />
-    <!-- no translation found for wifi_dpp_check_connection_no_matched_security (1462706753123341376) -->
-    <skip />
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Esta red Wi-Fi no está disponible en este momento"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Hay un problema con este código QR. Prueba a conectarte de otra forma."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Elegir red"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Elige una red para conectar tu dispositivo"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"¿Añadir este dispositivo a \"<xliff:g id="SSID">%1$s</xliff:g>\"?"</string>
@@ -1951,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Accesibilidad"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Teclado físico"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Teclas de rebote"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"El teclado ignora las pulsaciones rápidas repetidas de la misma tecla"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Umbral de tecla de rebote"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Elige el tiempo que tu teclado ignora las pulsaciones repetidas de teclas"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2 s"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4 s"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0,6 s"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Teclas lentas"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Ajusta el tiempo que se tarda en activar una pulsación de tecla"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Teclas persistentes"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Para las combinaciones de teclas, pulsa las teclas de una en una en lugar de mantenerlas pulsadas todas a la vez"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Teclas para el ratón"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Usa el teclado para controlar el puntero"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Desplazamiento inverso del ratón"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Desplázate hacia arriba para mover la página hacia abajo"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Cambiar los botones izquierdo y derecho"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Usa el botón izquierdo del ratón como el derecho"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Combinaciones de teclas"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Muestra la lista de combinaciones de teclas"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Perfiles de trabajo y herramientas"</string>
@@ -2039,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Elige una nueva tecla para <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Accesibilidad del teclado físico"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Teclas persistentes, teclas de rebote y teclas para el ratón"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Diseño <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Predeterminado"</string>
@@ -2447,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Vista previa"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Opciones estándar"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Idioma"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Tamaño de los subtítulos"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Estilo de los subtítulos"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Opciones personalizadas"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Color de fondo"</string>
@@ -2992,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"¿Desconectar esta VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Desconectar"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versión"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Olvidar VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"¿Reemplazar VPN actual?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"¿Configurar el modo de VPN siempre activada?"</string>
@@ -3924,8 +3921,7 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Crea un modo"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Modo personalizado"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Nombre del modo"</string>
-    <!-- no translation found for zen_mode_edit_name_empty_error (5788063278827188275) -->
-    <skip />
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"El nombre del modo no puede estar vacío"</string>
     <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Selecciona un icono"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Eventos del calendario"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Rutina Buenas noches"</string>
@@ -3946,7 +3942,7 @@
     <string name="zen_mode_blurb_immersive" msgid="5884004861848687869">"Bloquea las distracciones o interrupciones de tu dispositivo para concentrarte"</string>
     <string name="zen_mode_blurb_theater" msgid="2999237960059524225">"Elimina todas las distracciones para un ambiente silencioso"</string>
     <string name="zen_mode_blurb_managed" msgid="5473921634985032149">"Personaliza las experiencias y los ajustes del dispositivo para diferentes usuarios"</string>
-    <string name="zen_mode_blurb_generic" msgid="3041601339807075625">"Reduce las interrupciones al permitir que solo se pongan en contacto contigo las personas y aplicaciones importantes"</string>
+    <string name="zen_mode_blurb_generic" msgid="3041601339807075625">"Reduce interrupciones al solo permitir que ciertas personas y aplicaciones importantes se pongan en contacto contigo."</string>
     <string name="zen_mode_inspiration_schedule_time" msgid="5596540503159096153">"Configura un modo que siga un horario regular"</string>
     <string name="zen_mode_inspiration_schedule_calendar" msgid="3678727180860212700">"Mantén tu dispositivo sincronizado con los eventos del día"</string>
     <string name="zen_mode_inspiration_bedtime" msgid="6294822414181670666">"Empieza el día con energía"</string>
@@ -5468,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Buscar ajustes"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"contactos, almacenamiento, cuenta"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Almacenamiento de los contactos"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Solo en el dispositivo"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Los contactos nuevos no se sincronizarán con ninguna cuenta"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Los contactos se guardarán en tu dispositivo y se sincronizarán con tu cuenta de forma predeterminada"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Ninguna cuenta predeterminada definida"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Añade una cuenta para empezar"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
index 63bcbc6..250e2a2 100644
--- a/res/values-et/arrays.xml
+++ b/res/values-et/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Kohver"</item>
-    <item msgid="184985872234062767">"Klassikaline hoone"</item>
-    <item msgid="9189550412466785530">"Korterelamu"</item>
-    <item msgid="2142527562511049422">"Kõnemull"</item>
-    <item msgid="2548100558260478605">"Rühm inimesi"</item>
-    <item msgid="2270003903304578284">"Lambipirn"</item>
-    <item msgid="4793496619091161864">"Kalender"</item>
-    <item msgid="5673625795644364100">"Mitte segada"</item>
-    <item msgid="1423820834865831361">"Jooksev inimene"</item>
-    <item msgid="2037298830718732608">"Golf"</item>
-    <item msgid="2197835014443491074">"Jõusaali hantel"</item>
-    <item msgid="2730180105015616518">"Ujumine"</item>
-    <item msgid="2666922823253345958">"Matkav inimene"</item>
-    <item msgid="8234880356472211396">"Palli viskav inimene"</item>
-    <item msgid="4642980625253001443">"Jalahoopi andev inimene"</item>
-    <item msgid="4324795269518833500">"Mängupult"</item>
-    <item msgid="7789966425125441125">"Kunstniku värvipalett"</item>
-    <item msgid="663512680597461570">"Lumehelves"</item>
-    <item msgid="7952183800501346803">"Päikesevari"</item>
-    <item msgid="799139025758265891">"Õpitoa tööriistad"</item>
-    <item msgid="1330084588359129896">"Telk"</item>
-    <item msgid="3861584909935022342">"Filmilint"</item>
-    <item msgid="5827426100157335512">"Raamat"</item>
-    <item msgid="8585828346253128384">"Lootoseõis"</item>
-    <item msgid="8788370542815300188">"Inimese mõistus"</item>
-    <item msgid="7287354964767553293">"Kõrvaklapid"</item>
-    <item msgid="2530059623783800987">"Teler"</item>
-    <item msgid="5307182323469376758">"Rong"</item>
-    <item msgid="4903790544026923026">"Auto"</item>
-    <item msgid="5010405583912314582">"Kahvel ja nuga"</item>
-    <item msgid="8939998598599064900">"Ostukorv"</item>
-    <item msgid="3379605903308731893">"Laps"</item>
-    <item msgid="7808668968550293112">"Looma käpp"</item>
-    <item msgid="1000692647524056504">"Tähekese märk"</item>
-    <item msgid="8270261073421676502">"Kaks inimest"</item>
-    <item msgid="5767782819651505460">"Täht"</item>
-    <item msgid="4368451291862729334">"Süda"</item>
-    <item msgid="2613199102208419986">"Maja"</item>
-    <item msgid="3022279986430275040">"Poolkuu"</item>
-    <item msgid="5421089790869483206">"Kell"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 3519af7..4811a79 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Seadistage automaatselt oma võrgu ja juhtmeta ühenduse signaalide abil"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Automaatne ajavöönd"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Seadistage automaatselt enda lähedal olevate mobiilivõrkude põhjal"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Seadistage automaatselt oma seadme asukoha põhjal (kui on saadaval). Vaja võib olla ka aktiivset WiFi-ühendust."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Kasuta lokaadi vaikeseadet"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-tunnise vormingu kasutamine"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Kellaaeg"</string>
@@ -1958,6 +1959,10 @@
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Otseteede puhul klahvide korraga allhoidmise asemel vajutage klahve ükshaaval"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Hiireklahvid"</string>
     <string name="mouse_keys_summary" msgid="7030731235143286467">"Kasutage kursori juhtimiseks klaviatuuri"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Hiirega tagurpidi kerimine"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Lehe allapoole liigutamiseks kerige üles"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Vasaku ja parema nupu vahetamine"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Kasutage hiire vasakut nuppu parema nupuna"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Klaviatuuri otseteed"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Kuva otseteede loend"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Tööprofiili klaviatuurid ja tööriistad"</string>
@@ -2026,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Valige muuteklahvi <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> jaoks uus klahv:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Füüsilise klaviatuuri juurdepääsetavus"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Nakkeklahvid, põrkeklahvid, hiireklahvid"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Paigutus: <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Vaikeseade"</string>
@@ -2434,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Eelvaade"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standardvalikud"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Keel"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Subtiitrite suurus"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Subtiitri stiil"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Kohandatud valikud"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Tausta värv"</string>
@@ -2979,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Kas soovite katkestada ühenduse selle VPN-iga?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Katkesta ühendus"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versioon"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Unusta VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Kas asendada olemasolev VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Kas määrata alati sisselülitatud VPN?"</string>
@@ -5459,4 +5469,8 @@
     <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kontaktid salvestatakse teie seadmesse ja sünkroonitakse vaikimisi teie kontoga"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Ühtegi vaikekontot pole määratud"</string>
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Lisage alustamiseks konto"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
+    <skip />
 </resources>
diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml
index 4ff40ac..c55f571 100644
--- a/res/values-eu/arrays.xml
+++ b/res/values-eu/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Maletatxoa"</item>
-    <item msgid="184985872234062767">"Eraikin klasikoa"</item>
-    <item msgid="9189550412466785530">"Apartamentu-eraikina"</item>
-    <item msgid="2142527562511049422">"Testu-globoa"</item>
-    <item msgid="2548100558260478605">"Pertsona taldea"</item>
-    <item msgid="2270003903304578284">"Bonbilla"</item>
-    <item msgid="4793496619091161864">"Egutegia"</item>
-    <item msgid="5673625795644364100">"Ez molestatzeko"</item>
-    <item msgid="1423820834865831361">"Pertsona bat korrika"</item>
-    <item msgid="2037298830718732608">"Golfa"</item>
-    <item msgid="2197835014443491074">"Gimnasioko pisua"</item>
-    <item msgid="2730180105015616518">"Igeriketa"</item>
-    <item msgid="2666922823253345958">"Pertsona bat mendian"</item>
-    <item msgid="8234880356472211396">"Pertsona bat pilota bat botatzen"</item>
-    <item msgid="4642980625253001443">"Pertsona bat ostiko egiten"</item>
-    <item msgid="4324795269518833500">"Joko-kontrolagailua"</item>
-    <item msgid="7789966425125441125">"Artisten kolore-paleta"</item>
-    <item msgid="663512680597461570">"Elur-maluta"</item>
-    <item msgid="7952183800501346803">"Eguzkitakoa"</item>
-    <item msgid="799139025758265891">"Lantegiko tresnak"</item>
-    <item msgid="1330084588359129896">"Kanpin-denda"</item>
-    <item msgid="3861584909935022342">"Film-bobina"</item>
-    <item msgid="5827426100157335512">"Liburua"</item>
-    <item msgid="8585828346253128384">"Loto-lorea"</item>
-    <item msgid="8788370542815300188">"Pertsona baten burua"</item>
-    <item msgid="7287354964767553293">"Entzungailuak"</item>
-    <item msgid="2530059623783800987">"Telebista"</item>
-    <item msgid="5307182323469376758">"Trena"</item>
-    <item msgid="4903790544026923026">"Autoa"</item>
-    <item msgid="5010405583912314582">"Sardexka eta labana"</item>
-    <item msgid="8939998598599064900">"Erosketa-saskia"</item>
-    <item msgid="3379605903308731893">"Haurra"</item>
-    <item msgid="7808668968550293112">"Animalia-atzaparra"</item>
-    <item msgid="1000692647524056504">"Izar-bereizgarria"</item>
-    <item msgid="8270261073421676502">"2 pertsona"</item>
-    <item msgid="5767782819651505460">"Izarra"</item>
-    <item msgid="4368451291862729334">"Bihotza"</item>
-    <item msgid="2613199102208419986">"Etxea"</item>
-    <item msgid="3022279986430275040">"Ilargierdia"</item>
-    <item msgid="5421089790869483206">"Erlojua"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 764255f..cdba71e 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Ezarri automatikoki sarea eta hari gabeko seinaleak erabilita"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Ordu-zona automatikoa"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Ezarri automatikoki inguruko sare mugikorretan oinarrituta"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Ezarri automatikoki gailuaren kokapena erabilita, halakorik badago. Baliteke wifi-konexio aktibo bat ere behar izatea."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Erabili lurraldeko ezarpen lehenetsiak"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Erabili 24 orduko formatua"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Ordua"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Erabilerraztasuna"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Teklatu fisikoa"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Errebote-teklak"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Teklatuak ez ikusi egiten du tekla bera behin eta berriro bizkor sakatzen bada"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Tekla-sakatze errepikatuen atalasea"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Aukeratu zer iraupenarekin egiten duen teklatuak ez ikusi tekla bera behin eta berriro sakatzen bada"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2 s"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4 s"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0,6 s"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Tekla motelak"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Tekla bat sakatzean aktibatzeko behar den denbora doitzen du"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Tekla itsaskorrak"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Lasterbideetan, sakatu teklak banan-banan, guztiak aldi berean sakatu ordez"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Saguaren teklak"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Erabili teklatua erakuslea kontrolatzeko"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Saguarekin gora eta behera alderantziz egiteko aukera"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Egin gora orria beherantz mugitzeko"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Aldatu ezkerreko eta eskuineko botoiak"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Erabili saguaren ezkerreko botoia eskuinekoa balitz bezala"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Lasterbideak"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Erakutsi lasterbideen zerrenda"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Laneko profilaren teklatuak eta tresnak"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Aukeratu <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> teklarako beste tekla bat:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Teklatu fisikoaren erabilerraztasuna"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Tekla itsaskorrak, errebote-teklak, saguaren teklak"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> teklatuaren diseinua"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Lehenetsia"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Aurreikusi"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Aukera estandarrak"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Hizkuntza"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Azpitituluen tamaina"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Azpitituluen estiloa"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Aukera pertsonalizatuak"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Atzeko planoaren kolorea"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"VPN saretik deskonektatu nahi duzu?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Deskonektatu"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Bertsioa"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Ahaztu VPN konexioa"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Dagoen VPN konexioa ordeztu nahi duzu?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"VPNa beti aktibatuta egoteko aukera ezarri nahi duzu?"</string>
@@ -3100,7 +3102,7 @@
     <string name="emergency_info_summary" msgid="8463622253016757697">"Datuak eta kontaktuak (<xliff:g id="USER_NAME">%1$s</xliff:g>)"</string>
     <string name="open_app_button" msgid="5025229765547191710">"Ireki <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="276179173572729205">"Baimendu aplikazioak eta edukia"</string>
-    <string name="apps_with_restrictions_header" msgid="5277698582872267931">"Murrizketak dituzten aplikazioak"</string>
+    <string name="apps_with_restrictions_header" msgid="5277698582872267931">"Murriztapenak dituzten aplikazioak"</string>
     <string name="apps_with_restrictions_settings_button" msgid="2648355133416902221">"Zabaldu aplikazio-ezarpenak"</string>
     <string name="user_choose_copy_apps_to_another_user" msgid="5914037067347012870">"Aukeratu instalatu nahi dituzun aplikazioak"</string>
     <string name="user_copy_apps_menu_title" msgid="5354300105759670300">"Instalatu aplikazio erabilgarriak"</string>
@@ -3134,7 +3136,7 @@
     <string name="nfc_payment_btn_text_update" msgid="5159700960497443832">"Eguneratu"</string>
     <string name="nfc_work_text" msgid="2496515165821504077">"Lanekoak"</string>
     <string name="restriction_settings_title" msgid="4293731103465972557">"Murriztapenak"</string>
-    <string name="restriction_menu_reset" msgid="92859464456364092">"Kendu murrizketak"</string>
+    <string name="restriction_menu_reset" msgid="92859464456364092">"Kendu murriztapenak"</string>
     <string name="restriction_menu_change_pin" msgid="2505923323199003718">"Aldatu PINa"</string>
     <string name="help_label" msgid="2896538416436125883">"Laguntza eta iritziak"</string>
     <string name="user_account_title" msgid="6389636876210834864">"Edukia gordetzeko kontua"</string>
@@ -3175,7 +3177,7 @@
     <string name="work_sim_title" msgid="8999872928646924429">"Laneko SIM txartela"</string>
     <string name="user_restrictions_title" msgid="4068914244980335993">"Eduki eta aplikazioetarako sarbidea"</string>
     <string name="user_rename" msgid="8735940847878484249">"ALDATU IZENA"</string>
-    <string name="app_restrictions_custom_label" msgid="6949268049087435132">"Ezarri murrizketak aplikazioei"</string>
+    <string name="app_restrictions_custom_label" msgid="6949268049087435132">"Ezarri murriztapenak aplikazioei"</string>
     <string name="user_restrictions_controlled_by" msgid="2821526006742851624">"<xliff:g id="APP">%1$s</xliff:g> aplikazioak kontrolatua"</string>
     <string name="app_sees_restricted_accounts" msgid="3526008344222566318">"Aplikazioak zure kontuak atzi ditzake"</string>
     <string name="app_sees_restricted_accounts_and_controlled_by" msgid="8338520379923447143">"Aplikazio honek zure kontuak atzi ditzake. <xliff:g id="APP">%1$s</xliff:g> aplikazioak kontrolatua."</string>
@@ -3482,7 +3484,7 @@
     <string name="zen_mode_restrict_notifications_summary_muted" msgid="2826459087306271381">"Erakutsi jakinarazpenak"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="6455811408721183198">"Jakinarazpenak partzialki ezkutatuta"</string>
     <string name="zen_mode_restrict_notifications_summary_hidden" msgid="2157279412167366119">"Ezkutatu jakinarazpenak"</string>
-    <string name="zen_mode_what_to_block_title" msgid="5692710098205334164">"Murrizketa pertsonalizatuak"</string>
+    <string name="zen_mode_what_to_block_title" msgid="5692710098205334164">"Murriztapen pertsonalizatuak"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="8780668375194500987">"Pantaila piztuta dagoenean"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="2291988790355612826">"Pantaila itzalita dagoenean"</string>
     <string name="zen_mode_block_effect_sound" msgid="7929909410442858327">"Desaktibatu soinua eta dardara"</string>
@@ -3919,7 +3921,7 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Sortu modu bat"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Modu pertsonalizatua"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Moduaren izena"</string>
-    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Moduaren izenak ezin du hutsik egon"</string>
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Moduaren izena ezin da hutsik egon"</string>
     <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Aukeratu ikono bat"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Egutegiko gertaerak"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Lo egiteko garaiko ohitura"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Bilatu ezarpenetan"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"kontaktuak, biltegia, kontua"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Kontaktuen biltegia"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Gailua soilik"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Kontaktu berriak ez dira sinkronizatuko kontu batekin"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kontaktuak gailuan gordeko dira, eta modu lehenetsian kontuarekin sinkronizatuko"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Ez da ezarri kontu lehenetsirik"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Hasteko, gehitu kontu bat"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index aa67b97..598b30d 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"کیف اداری"</item>
-    <item msgid="184985872234062767">"ساختمان کلاسيک"</item>
-    <item msgid="9189550412466785530">"آپارتمان"</item>
-    <item msgid="2142527562511049422">"حباب گفتگو"</item>
-    <item msgid="2548100558260478605">"گروهی از افراد"</item>
-    <item msgid="2270003903304578284">"لامپ حبابی"</item>
-    <item msgid="4793496619091161864">"تقویم"</item>
-    <item msgid="5673625795644364100">"مزاحم نشوید"</item>
-    <item msgid="1423820834865831361">"فردی درحال دویدن"</item>
-    <item msgid="2037298830718732608">"گلف"</item>
-    <item msgid="2197835014443491074">"دمبل باشگاهی"</item>
-    <item msgid="2730180105015616518">"شنا"</item>
-    <item msgid="2666922823253345958">"فردی درحال پیاده‌گردی"</item>
-    <item msgid="8234880356472211396">"فردی درحال توپ انداختن"</item>
-    <item msgid="4642980625253001443">"فردی درحال لگد زدن"</item>
-    <item msgid="4324795269518833500">"کنترل بازی"</item>
-    <item msgid="7789966425125441125">"پالت رنگ هنرمند"</item>
-    <item msgid="663512680597461570">"دانه برف"</item>
-    <item msgid="7952183800501346803">"چتر ساحلی"</item>
-    <item msgid="799139025758265891">"ابزارهای کارگاه"</item>
-    <item msgid="1330084588359129896">"چادر"</item>
-    <item msgid="3861584909935022342">"حلقه فیلم"</item>
-    <item msgid="5827426100157335512">"کتاب"</item>
-    <item msgid="8585828346253128384">"گل نیلوفر آبی"</item>
-    <item msgid="8788370542815300188">"ذهن فرد"</item>
-    <item msgid="7287354964767553293">"هدفون"</item>
-    <item msgid="2530059623783800987">"تلویزیون"</item>
-    <item msgid="5307182323469376758">"قطار"</item>
-    <item msgid="4903790544026923026">"خودرو"</item>
-    <item msgid="5010405583912314582">"کارد و چنگال"</item>
-    <item msgid="8939998598599064900">"سبد خرید"</item>
-    <item msgid="3379605903308731893">"کودک"</item>
-    <item msgid="7808668968550293112">"پنجه حیوان"</item>
-    <item msgid="1000692647524056504">"نشان ستاره"</item>
-    <item msgid="8270261073421676502">"دو شخص"</item>
-    <item msgid="5767782819651505460">"ستاره"</item>
-    <item msgid="4368451291862729334">"قلب"</item>
-    <item msgid="2613199102208419986">"خانه"</item>
-    <item msgid="3022279986430275040">"ماه نیمه"</item>
-    <item msgid="5421089790869483206">"ساعت"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index f39f13e..3c85810 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"به‌طور خودکار بااستفاده از سیگنال‌های شبکه و بی‌سیم تنظیم می‌شود"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"منطقه زمانی خودکار"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"به‌طور خودکار براساس شبکه‌های تلفن همراه اطرافتان تنظیم می‌شود"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"‏به‌طور خودکار با مکان دستگاه (اگر دردسترس باشد) تنظیم می‌شود. شاید اتصال فعال Wi-Fi نیز لازم باشد."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"استفاده از پیش‌فرض منطقه زبانی"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"استفاده از قالب ۲۴ ساعته"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"زمان"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"دسترس‌پذیری"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"صفحه‌کلید فیزیکی"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"کلیدهای واگشت"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"صفحه‌کلید فشردن‌های تکراری و سریع یک کلید را نادیده می‌گیرد"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"آستانه کلیدهای ضدتکرار"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"مدت زمانی را که صفحه‌کلید شما فشردن‌های تکراری کلید را نادیده می‌گیرد انتخاب کنید"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"‫۰٫۲ ثانیه"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"‫۰٫۴ ثانیه"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"‫۰٫۶ ثانیه"</string>
     <string name="slow_keys" msgid="2891452895499690837">"کلیدهای آهسته"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"فاصله زمانی بین فشردن کلید و فعال‌سازی آن را تنظیم می‌کند"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"کلیدهای چسبان"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"به‌جای اینکه چند کلید را به‌طور هم‌زمان پایین نگه دارید، هربار یک کلید را برای میان‌برها فشار دهید"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"کلیدهای موشواره"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"استفاده از صفحه‌کلید برای کنترل کردن اشاره‌گر"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"پیمایش معکوس موشواره"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"برای رفتن به‌پایین صفحه، به‌بالا پیمایش کنید"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"جابه‌جا کردن دکمه‌های چپ و راست"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"استفاده از دکمه چپ موشواره به‌عنوان کلیک راست"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"میان‌برهای صفحه‌کلید"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"نمایش فهرست میان‌برها"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"نمایه کاری صفحه‌کلیدها و ابزارها"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"کلید جدیدی برای <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> انتخاب کنید:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"دسترس‌پذیری صفحه‌کلید فیزیکی"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"کلیدهای چسبان، کلیدهای کمانه‌ای، کلیدهای موشواره"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"چیدمان <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"پیش‌فرض"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"پیش‌نمایش"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"گزینه‌های استاندارد"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"زبان"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"اندازه زیرنویس ناشنوایان"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"سبک زیرنویس"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"گزینه‌های سفارشی"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"رنگ پس‌زمینه"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"‏اتصال به این VPN.قطع‌ شود؟"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"قطع ارتباط"</string>
     <string name="vpn_version" msgid="6344167191984400976">"نسخه"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"‏فراموش کردن VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"‏VPN موجود جایگزین شود؟"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"‏VPN همیشه روشن تنظیم شود؟"</string>
@@ -4403,7 +4405,7 @@
     <string name="dark_theme_slice_title" msgid="4684222119481114062">"زمینه تاریک را امتحان کنید"</string>
     <string name="dark_theme_slice_subtitle" msgid="5555724345330434268">"به افزایش عمر باتری کمک می‌کند"</string>
     <string name="quick_settings_developer_tiles" msgid="7336007844525766623">"کاشی‌های برنامه‌نویسی تنظیمات سریع"</string>
-    <string name="adb_authorization_timeout_title" msgid="6996844506783749754">"‏غیرفعال کردن درنگ مجوز adb"</string>
+    <string name="adb_authorization_timeout_title" msgid="6996844506783749754">"‏غیرفعال کردن مهلت مجوز adb adb"</string>
     <string name="adb_authorization_timeout_summary" msgid="409931540424019778">"‏فسخ خودکار مجوزهای ADB (پل اشکال‌زدایی Android) برای سیستم‌هایی که ظرف مدت زمان پیش‌فرض (۷ روز) یا پیکربندی‌شده توسط کاربر (حداقل ۱ روز) دوباره متصل نشده‌اند، غیرفعال شود."</string>
     <string name="sensors_off_quick_settings_title" msgid="8472151847125917167">"حسگرها خاموش است"</string>
     <string name="managed_profile_settings_title" msgid="3400923723423564217">"تنظیمات نمایه کاری"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"جستجو در «تنظیمات»"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"مخاطبین، فضای ذخیره‌سازی، حساب"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"فضای ذخیره‌سازی مخاطبین"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"فقط دستگاه"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"مخاطبین جدید با هیچ حسابی همگام‌سازی نمی‌شوند"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"مخاطبین به‌طور پیش‌فرض در دستگاه شما ذخیره می‌شوند و با حسابتان همگام‌سازی می‌شوند"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"حساب پیش‌فرضی تنظیم نشده است"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"برای شروع، حسابی اضافه کنید"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index 8cb72b4..0e9ff9e 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Salkku"</item>
-    <item msgid="184985872234062767">"Klassinen rakennus"</item>
-    <item msgid="9189550412466785530">"Kerrostalo"</item>
-    <item msgid="2142527562511049422">"Puhekupla"</item>
-    <item msgid="2548100558260478605">"Ryhmä ihmisiä"</item>
-    <item msgid="2270003903304578284">"Hehkulamppu"</item>
-    <item msgid="4793496619091161864">"Kalenteri"</item>
-    <item msgid="5673625795644364100">"Älä häiritse"</item>
-    <item msgid="1423820834865831361">"Juokseva henkilö"</item>
-    <item msgid="2037298830718732608">"Golf"</item>
-    <item msgid="2197835014443491074">"Kuntosalin käsipaino"</item>
-    <item msgid="2730180105015616518">"Uinti"</item>
-    <item msgid="2666922823253345958">"Vaelluksella oleva henkilö"</item>
-    <item msgid="8234880356472211396">"Palloa heittävä henkilö"</item>
-    <item msgid="4642980625253001443">"Potkiva henkilö"</item>
-    <item msgid="4324795269518833500">"Peliohjain"</item>
-    <item msgid="7789966425125441125">"Taiteilijan väripaletti"</item>
-    <item msgid="663512680597461570">"Lumihiutale"</item>
-    <item msgid="7952183800501346803">"Rantavarjo"</item>
-    <item msgid="799139025758265891">"Työkalut"</item>
-    <item msgid="1330084588359129896">"Teltta"</item>
-    <item msgid="3861584909935022342">"Vanha kotivideo"</item>
-    <item msgid="5827426100157335512">"Kirja"</item>
-    <item msgid="8585828346253128384">"Lootuskukka"</item>
-    <item msgid="8788370542815300188">"Ihmisen mieli"</item>
-    <item msgid="7287354964767553293">"Kuulokkeet"</item>
-    <item msgid="2530059623783800987">"TV"</item>
-    <item msgid="5307182323469376758">"Juna"</item>
-    <item msgid="4903790544026923026">"Auto"</item>
-    <item msgid="5010405583912314582">"Haarukka ja veitsi"</item>
-    <item msgid="8939998598599064900">"Ostoskori"</item>
-    <item msgid="3379605903308731893">"Lapsi"</item>
-    <item msgid="7808668968550293112">"Eläimen tassu"</item>
-    <item msgid="1000692647524056504">"Tähtimerkki"</item>
-    <item msgid="8270261073421676502">"Kaksi henkilöä"</item>
-    <item msgid="5767782819651505460">"Tähti"</item>
-    <item msgid="4368451291862729334">"Sydän"</item>
-    <item msgid="2613199102208419986">"House"</item>
-    <item msgid="3022279986430275040">"Puolikuu"</item>
-    <item msgid="5421089790869483206">"Kello"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 6b40627..39f10e2 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Määritä automaattisesti verkon ja langattomien signaalien perusteella"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Automaattinen aikavyöhyke"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Määritä automaattisesti lähellä olevien mobiiliverkkojen perusteella"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Määritä automaattisesti sijainnin perusteella, jos saatavilla. Voi vaatia aktiivista Wi-Fi-yhteyttä."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Käytä paikallista oletusasetusta"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Käytä 24-tuntista kelloa"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Aika"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Saavutettavuus"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Fyysinen näppäimistö"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Toistuvien painallusten ohitus"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Näppäimistö ei huomioi nopeasti toistettuja saman näppäimen painalluksia"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Toistuvan painalluksen ohituskynnys"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Valitse, kuinka kauan näppäimistö ohittaa toistuvat painallukset"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2 s"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4 s"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0,6 s"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Hitaat näppäimet"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Muuta aikaa, joka näppäimellä kuluu aktivoitumiseen painalluksen jälkeen"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Päälle jäävät näppäimet"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Käytä pikanäppäimiä painamalla yhtä näppäintä kerralla monen näppäimen sijaan"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Hiiren painikkeet"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Ohjaa osoitinta näppäimistöllä"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Hiiren käänteinen vieritys"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Siirry alaspäin sivulla vierittämällä ylöspäin"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Vaihda vasemman ja oikean painikkeen paikkaa"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Käytä hiiren vasenta painiketta oikeana"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Pikanäppäimet"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Näytä pikanäppäimet"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Työprofiilin näppäimistöt ja työkalut"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Valitse uusi näppäin (<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>):"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Fyysisen näppäimistön saavutettavuus"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Päälle jäävät näppäimet, toistuvien painallusten ohitus, hiiren painikkeet"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Asettelu: <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Oletus"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Esikatselu"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Vakioasetukset"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Kieli"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Tekstityksen koko"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Tekstityksen tyyli"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Omat asetukset"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Taustaväri"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Katkaistaanko VPN-yhteys?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Katkaise yhteys"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versio"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Unohda VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Korvataanko nykyinen VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Määritetäänkö aina käytössä oleva VPN?"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Hae asetuksista"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"yhteystiedot, tallennustila, tili"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Yhteystietojen säilytys"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Vain laite"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Uusia yhteystietoja ei synkronoida tilille"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Yhteystiedot tallennetaan laitteelle ja synkronoidaan tilillesi oletuksena"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Oletusta ei ole asetettu."</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Aloita lisäämällä tili"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml
index 12749a5..6c77e66 100644
--- a/res/values-fr-rCA/arrays.xml
+++ b/res/values-fr-rCA/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Mallette"</item>
-    <item msgid="184985872234062767">"Bâtiment classique"</item>
-    <item msgid="9189550412466785530">"Bâtiment résidentiel"</item>
-    <item msgid="2142527562511049422">"Bulle de texte"</item>
-    <item msgid="2548100558260478605">"Groupe de personnes"</item>
-    <item msgid="2270003903304578284">"Ampoule"</item>
-    <item msgid="4793496619091161864">"Agenda"</item>
-    <item msgid="5673625795644364100">"Ne pas déranger"</item>
-    <item msgid="1423820834865831361">"Personne qui court"</item>
-    <item msgid="2037298830718732608">"Golf"</item>
-    <item msgid="2197835014443491074">"Haltères d\'entraînement"</item>
-    <item msgid="2730180105015616518">"Natation"</item>
-    <item msgid="2666922823253345958">"Personne faisant de la randonnée pédestre"</item>
-    <item msgid="8234880356472211396">"Personne lançant un ballon"</item>
-    <item msgid="4642980625253001443">"Personne donnant un coup de pied"</item>
-    <item msgid="4324795269518833500">"Manette de jeu"</item>
-    <item msgid="7789966425125441125">"Palette de couleurs d\'un artiste"</item>
-    <item msgid="663512680597461570">"Flocon de neige"</item>
-    <item msgid="7952183800501346803">"Parasol"</item>
-    <item msgid="799139025758265891">"Outils d\'atelier"</item>
-    <item msgid="1330084588359129896">"Tente"</item>
-    <item msgid="3861584909935022342">"Pellicule de film"</item>
-    <item msgid="5827426100157335512">"Livre"</item>
-    <item msgid="8585828346253128384">"Fleur de lotus"</item>
-    <item msgid="8788370542815300188">"Esprit d\'une personne"</item>
-    <item msgid="7287354964767553293">"Casque d\'écoute"</item>
-    <item msgid="2530059623783800987">"Téléviseur"</item>
-    <item msgid="5307182323469376758">"Train"</item>
-    <item msgid="4903790544026923026">"Voiture"</item>
-    <item msgid="5010405583912314582">"Fourchette et couteau"</item>
-    <item msgid="8939998598599064900">"Panier de magasinage"</item>
-    <item msgid="3379605903308731893">"Enfant"</item>
-    <item msgid="7808668968550293112">"Patte d\'animal"</item>
-    <item msgid="1000692647524056504">"Badge d\'étoile"</item>
-    <item msgid="8270261073421676502">"Deux personnes"</item>
-    <item msgid="5767782819651505460">"Étoile"</item>
-    <item msgid="4368451291862729334">"Cœur"</item>
-    <item msgid="2613199102208419986">"Maison"</item>
-    <item msgid="3022279986430275040">"Demi-lune"</item>
-    <item msgid="5421089790869483206">"Horloge"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index fc7fe09..e396f79 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Configurez automatiquement ce paramètre à l\'aide de votre réseau et de vos signaux sans fil"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Fuseau horaire automatique"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Configurez ce paramètre automatiquement en fonction des réseaux cellulaires à proximité"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Configurez automatiquem. ce param. si localis. d\'appareil est dispo. Connex. Wi-Fi peut être nécess."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Utiliser les paramètres régionaux par défaut"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Utiliser le format 24 h"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Heure"</string>
@@ -659,12 +660,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Créer un schéma pour l\'Espace privé"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Verrouiller"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Masquer"</string>
-    <!-- no translation found for private_space_confirm_your_pattern_header (449382220134788771) -->
-    <skip />
-    <!-- no translation found for private_space_confirm_your_pin_header (4543332157470087796) -->
-    <skip />
-    <!-- no translation found for private_space_confirm_your_password_header (9202308075814307169) -->
-    <skip />
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Confirmer le schéma de votre espace privé"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Entrer à nouveau le NIP de votre espace privé"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Entrer à nouveau le mot de passe de l\'espace privé"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Vous pouvez ajouter jusqu\'à <xliff:g id="COUNT">%d</xliff:g> empreintes digitales"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Vous avez ajouté le nombre maximal d\'empreintes digitales"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Impossible d\'ajouter des empreintes digitales"</string>
@@ -1032,10 +1030,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Vérifiez votre mot de passe, puis réessayez"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Communiquez avec le fabricant de l\'appareil"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Vérifiez votre connexion et réessayez"</string>
-    <!-- no translation found for wifi_dpp_check_connection_no_matched_ssid (3608318690698685427) -->
-    <skip />
-    <!-- no translation found for wifi_dpp_check_connection_no_matched_security (1462706753123341376) -->
-    <skip />
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Ce réseau Wi-Fi n\'est pas accessible pour le moment"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Il y a un problème avec ce code QR. Essayez de vous connecter d\'une autre manière."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Choisir un réseau"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Pour connecter votre appareil, choisissez un réseau"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Ajouter cet appareil au réseau « <xliff:g id="SSID">%1$s</xliff:g> »?"</string>
@@ -1951,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Accessibilité"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Clavier physique"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Touches non répétées"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Le clavier ignore les appuis répétés rapidement sur la même touche"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Seuil de la touche non répétée"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Choisissez la durée pendant laquelle votre clavier ignore les appuis répétés sur une touche"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2 s"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4 s"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0,6 s"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Touches lentes"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Règle le temps nécessaire pour qu\'un appui sur une touche soit activé"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Touches rémanentes"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Appuyer sur une clé à la fois pour activer les raccourcis plutôt que de maintenir plusieurs touches enfoncées en même temps"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Touches de la souris"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Utiliser votre clavier pour contrôler le pointeur"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Défilement inversé de la souris"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Faites défiler l\'écran vers le haut pour déplacer la page vers le bas"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Inverser les boutons gauche et droit"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Utilisez le bouton gauche de la souris comme bouton droit"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Raccourcis clavier"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Afficher la liste de raccourcis"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Claviers et outils pour le profil professionnel"</string>
@@ -2039,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Choisir une nouvelle touche pour <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> :"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Accessibilité du clavier physique"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Touches rémanentes, touches non répétées, touches de la souris"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Mise en page <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Par défaut"</string>
@@ -2447,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Aperçu"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Options standards"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Langue"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Taille des sous-titres"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Style de sous-titres"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Options de personnalisation"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Couleur de l\'arrière-plan"</string>
@@ -2992,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Déconnecter ce RPV?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Déconnecter"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Version"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Oublier le profil RPV"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Remplacer le RPV existant?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Définir le RPV permanent?"</string>
@@ -3924,8 +3921,7 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Créer un mode"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Mode personnalisé"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Nom du mode"</string>
-    <!-- no translation found for zen_mode_edit_name_empty_error (5788063278827188275) -->
-    <skip />
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Le nom du mode est obligatoire"</string>
     <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Sélectionner une icône"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Événements d\'agenda"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Routine Heure du coucher"</string>
@@ -5468,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Paramètres de recherche"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"contacts, stockage, compte"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Stockage des contacts"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Appareil uniquement"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Les nouveaux contacts ne seront pas synchronisés avec un compte"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Les contacts seront enregistrés sur votre appareil et synchronisés avec votre compte par défaut"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Aucun compte par défaut n\'a été défini"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Ajoutez un compte pour commencer"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 4a2e6e2..c04d39c 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Sacoche"</item>
-    <item msgid="184985872234062767">"Bâtiment classique"</item>
-    <item msgid="9189550412466785530">"Immeuble d\'appartements"</item>
-    <item msgid="2142527562511049422">"Bulle de texte"</item>
-    <item msgid="2548100558260478605">"Groupe de personnes"</item>
-    <item msgid="2270003903304578284">"Ampoule"</item>
-    <item msgid="4793496619091161864">"Agenda"</item>
-    <item msgid="5673625795644364100">"Ne pas déranger"</item>
-    <item msgid="1423820834865831361">"Personne qui court"</item>
-    <item msgid="2037298830718732608">"Golf"</item>
-    <item msgid="2197835014443491074">"Haltère"</item>
-    <item msgid="2730180105015616518">"Natation"</item>
-    <item msgid="2666922823253345958">"Personne faisant de la randonnée"</item>
-    <item msgid="8234880356472211396">"Personne lançant une balle"</item>
-    <item msgid="4642980625253001443">"Personne donnant un coup de pied"</item>
-    <item msgid="4324795269518833500">"Manette de jeu"</item>
-    <item msgid="7789966425125441125">"Palette de couleurs d\'artiste"</item>
-    <item msgid="663512680597461570">"Flocon de neige"</item>
-    <item msgid="7952183800501346803">"Parasol"</item>
-    <item msgid="799139025758265891">"Outils d\'atelier"</item>
-    <item msgid="1330084588359129896">"Tente"</item>
-    <item msgid="3861584909935022342">"Bobine de film"</item>
-    <item msgid="5827426100157335512">"Livre"</item>
-    <item msgid="8585828346253128384">"Fleur de lotus"</item>
-    <item msgid="8788370542815300188">"Esprit d\'une personne"</item>
-    <item msgid="7287354964767553293">"Écouteurs"</item>
-    <item msgid="2530059623783800987">"TV"</item>
-    <item msgid="5307182323469376758">"Train"</item>
-    <item msgid="4903790544026923026">"Voiture"</item>
-    <item msgid="5010405583912314582">"Fourchette et couteau"</item>
-    <item msgid="8939998598599064900">"Panier"</item>
-    <item msgid="3379605903308731893">"Enfant"</item>
-    <item msgid="7808668968550293112">"Patte d\'animal"</item>
-    <item msgid="1000692647524056504">"Badge en forme d\'étoile"</item>
-    <item msgid="8270261073421676502">"Deux personnes"</item>
-    <item msgid="5767782819651505460">"Étoile"</item>
-    <item msgid="4368451291862729334">"Cœur"</item>
-    <item msgid="2613199102208419986">"Maison"</item>
-    <item msgid="3022279986430275040">"Demi-lune"</item>
-    <item msgid="5421089790869483206">"Horloge"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 848870a..ae080f7 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -181,8 +181,8 @@
     <string name="desc_app_locale_disclaimer" msgid="5295933110644789052">"La langue peut différer de celles disponibles dans l\'appli. Certaines applis ne sont pas compatibles avec ce paramètre."</string>
     <string name="desc_app_locale_selection_supported" msgid="6744909281573556379">"Définissez la langue pour chaque appli."</string>
     <string name="desc_introduction_of_language_picker" msgid="4012265379885200083">"Votre appareil, les applis et les sites Web utilisent la première langue prise en charge de votre liste de langues préférées.\n\nDe nombreuses applis se baseront également sur la région de votre langue préférée pour mettre en forme les dates, les nombres et les unités. Pour modifier votre région, ajoutez une langue, puis sélectionnez votre région préférée."</string>
-    <string name="desc_notice_of_language_picker" msgid="3449290526457925447">"Pour sélectionner une langue pour chaque appli, accédez aux paramètres de langue de cette appli."</string>
-    <string name="desc_locale_helper_footer_general" msgid="6112153921151780303">"En savoir plus sur les langues des applis"</string>
+    <string name="desc_notice_of_language_picker" msgid="3449290526457925447">"Pour sélectionner une langue pour chaque application, accédez aux paramètres de langue de cette application."</string>
+    <string name="desc_locale_helper_footer_general" msgid="6112153921151780303">"En savoir plus sur les langues des applications"</string>
     <string name="title_change_system_locale" msgid="8589844586256566951">"Sélectionner %s comme langue du système ?"</string>
     <string name="title_system_locale_addition" msgid="8218683660751479466">"Ajouter %s aux langues préférées ?"</string>
     <string name="desc_system_locale_addition" msgid="3409917362651596070">"Cela permet aux applis et sites Web de savoir que vous préférez aussi cette langue."</string>
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Définir automatiquement à l\'aide de votre réseau et de vos signaux sans fil"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Fuseau horaire automatique"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Définir automatiquement en fonction des réseaux mobiles à proximité"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Définir automatiquement grâce à la position de votre appareil, si celle-ci est disponible. Une connexion Wi-Fi active peut aussi être requise."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Utiliser les paramètres régionaux par défaut"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Utiliser le format 24h"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Heure"</string>
@@ -659,12 +660,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Définissez un schéma pour l\'espace privé"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Verrouiller"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Masquer"</string>
-    <!-- no translation found for private_space_confirm_your_pattern_header (449382220134788771) -->
-    <skip />
-    <!-- no translation found for private_space_confirm_your_pin_header (4543332157470087796) -->
-    <skip />
-    <!-- no translation found for private_space_confirm_your_password_header (9202308075814307169) -->
-    <skip />
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Confirmez le schéma de votre espace privé"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Saisissez à nouveau le code de votre espace privé"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Saisissez de nouveau le mot de passe de votre espace privé"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Vous pouvez ajouter jusqu\'à <xliff:g id="COUNT">%d</xliff:g> empreintes digitales"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Vous avez ajouté le nombre maximal autorisé d\'empreintes digitales"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Impossible d\'ajouter d\'autres empreintes digitales"</string>
@@ -1032,10 +1030,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Vérifiez le mot de passe et réessayez"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Contactez le fabricant de l\'appareil"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Vérifiez la connexion et réessayez"</string>
-    <!-- no translation found for wifi_dpp_check_connection_no_matched_ssid (3608318690698685427) -->
-    <skip />
-    <!-- no translation found for wifi_dpp_check_connection_no_matched_security (1462706753123341376) -->
-    <skip />
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Ce réseau Wi‑Fi n\'est pas disponible pour le moment"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Ce code QR présente un problème. Essayez de vous connecter d\'une autre manière."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Sélectionner un réseau"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Sélectionnez un réseau pour connecter l\'appareil"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Ajouter cet appareil à \"<xliff:g id="SSID">%1$s</xliff:g>\" ?"</string>
@@ -1951,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Accessibilité"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Clavier physique"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Touches à rebonds"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Le clavier ignore les frappes rapides et consécutives d\'une même touche"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Seuil de touches filtres"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Choisissez la durée pendant laquelle votre clavier ignore les frappes consécutives d\'une touche"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2 s"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4 s"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0,6 s"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Touches lentes"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Règle le temps de réponse à la pression d\'une touche"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Touches persistantes"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Pour les raccourcis, appuyer sur une touche à la fois au lieu de maintenir les touches enfoncées"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Touches pour la souris"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Utilisez le clavier pour contrôler le pointeur"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Défilement inversé avec la souris"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Faire défiler vers le haut pour déplacer la page vers le bas"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Inverser les boutons gauche et droit"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Utiliser le bouton gauche de la souris comme bouton droit"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Raccourcis clavier"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Afficher la liste des raccourcis"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Claviers et outils du profil professionnel"</string>
@@ -2039,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Choisir une nouvelle touche pour <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> :"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Accessibilité du clavier physique"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Touches rémanentes, touches à rebonds, touches pour la souris"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Mise en page <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Par défaut"</string>
@@ -2447,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Aperçu"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Options standards"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Langue"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Taille des sous-titres"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Style des sous-titres"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Options de personnalisation"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Couleur d\'arrière-plan"</string>
@@ -2992,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Déconnecter ce VPN ?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Déconnecter"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Version"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Supprimer le VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Remplacer le VPN existant ?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Définir le VPN permanent ?"</string>
@@ -3715,7 +3712,7 @@
     <string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"D\'autres paramètres sont disponibles dans l\'appli"</string>
     <string name="notification_polite_title" msgid="6121016426991791557">"Limitation des notifications"</string>
     <string name="notification_polite_main_control_title" msgid="5812529809151927149">"Utiliser la limitation des notifications"</string>
-    <string name="notification_polite_description" msgid="5497748284893832854">"Si vous recevez beaucoup de notifications en peu de temps, votre appareil baisse le volume et réduit les alertes pendant 2 minutes maximum. Les appels, les alarmes et les conversations prioritaires ne sont pas affectés. \n\nLes notifications reçues pendant la limitation sont accessibles en faisant glisser votre doigt du haut de l\'écran vers le bas."</string>
+    <string name="notification_polite_description" msgid="5497748284893832854">"Si vous recevez beaucoup de notifications en peu de temps, votre appareil réduit le volume et les alertes pendant 2 minutes maximum. Les appels, les alarmes et les conversations prioritaires ne sont pas affectés. \n\nLes notifications reçues pendant la limitation sont accessibles en faisant glisser votre doigt du haut de l\'écran vers le bas."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Appliquer aux profils professionnels"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"Appliquer aux applis des profils professionnels"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Services d\'assistance RV"</string>
@@ -3924,8 +3921,7 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Créer un mode"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Mode personnalisé"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Nom du mode"</string>
-    <!-- no translation found for zen_mode_edit_name_empty_error (5788063278827188275) -->
-    <skip />
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Vous devez indiquer un nom de mode"</string>
     <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Sélectionnez une icône"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Événements d\'agenda"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Routine Heure du coucher"</string>
@@ -5468,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Rechercher un paramètre"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"contacts, stockage, compte"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Stockage des contacts"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Appareil uniquement"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Les nouveaux contacts ne seront pas synchronisés avec un compte"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Les contacts seront enregistrés sur votre appareil et synchronisés avec votre compte par défaut"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Aucun compte par défaut n\'a été défini"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Ajoutez un compte pour commencer"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-gl/arrays.xml b/res/values-gl/arrays.xml
index 49cbf33..08f58f7 100644
--- a/res/values-gl/arrays.xml
+++ b/res/values-gl/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Portadocumentos"</item>
-    <item msgid="184985872234062767">"Edificio clásico"</item>
-    <item msgid="9189550412466785530">"Bloque de pisos"</item>
-    <item msgid="2142527562511049422">"Globo de diálogo"</item>
-    <item msgid="2548100558260478605">"Grupo de persoas"</item>
-    <item msgid="2270003903304578284">"Lámpada"</item>
-    <item msgid="4793496619091161864">"Calendario"</item>
-    <item msgid="5673625795644364100">"Modo Non molestar"</item>
-    <item msgid="1423820834865831361">"Persoa correndo"</item>
-    <item msgid="2037298830718732608">"Golf"</item>
-    <item msgid="2197835014443491074">"Pesa de man de ximnasio"</item>
-    <item msgid="2730180105015616518">"Natación"</item>
-    <item msgid="2666922823253345958">"Persoa facendo sendeirismo"</item>
-    <item msgid="8234880356472211396">"Persoa lanzando unha pelota"</item>
-    <item msgid="4642980625253001443">"Persoa dando unha patada"</item>
-    <item msgid="4324795269518833500">"Mando de xogo"</item>
-    <item msgid="7789966425125441125">"Paleta de cores de artista"</item>
-    <item msgid="663512680597461570">"Folerpa"</item>
-    <item msgid="7952183800501346803">"Parasol"</item>
-    <item msgid="799139025758265891">"Ferramentas dun taller"</item>
-    <item msgid="1330084588359129896">"Tenda"</item>
-    <item msgid="3861584909935022342">"Rolo de película"</item>
-    <item msgid="5827426100157335512">"Libro"</item>
-    <item msgid="8585828346253128384">"Flor de loto"</item>
-    <item msgid="8788370542815300188">"Mente dunha persoa"</item>
-    <item msgid="7287354964767553293">"Auriculares"</item>
-    <item msgid="2530059623783800987">"Televisión"</item>
-    <item msgid="5307182323469376758">"Tren"</item>
-    <item msgid="4903790544026923026">"Coche"</item>
-    <item msgid="5010405583912314582">"Garfo e coitelo"</item>
-    <item msgid="8939998598599064900">"Cesta da compra"</item>
-    <item msgid="3379605903308731893">"Nena ou neno"</item>
-    <item msgid="7808668968550293112">"Pouta"</item>
-    <item msgid="1000692647524056504">"Insignia de estrela"</item>
-    <item msgid="8270261073421676502">"Dúas persoas"</item>
-    <item msgid="5767782819651505460">"Estrela"</item>
-    <item msgid="4368451291862729334">"Corazón"</item>
-    <item msgid="2613199102208419986">"Casa"</item>
-    <item msgid="3022279986430275040">"Media lúa"</item>
-    <item msgid="5421089790869483206">"Reloxo"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index c9a75b7..012538e 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"A data e a hora definiranse automaticamente coa axuda da rede e os sinais sen fíos"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Fuso horario automático"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"O fuso horario definirase automaticamente en función das redes de telefonía móbil que teñas preto"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Data e hora automáticas segundo a localización do dispositivo. Pódese precisar unha conexión wifi activa."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Usar configuración rexional predeterminada"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Usar formato de 24 horas"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Hora"</string>
@@ -1946,25 +1947,25 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Accesibilidade"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Teclado físico"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Teclas de rebote"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"O teclado ignorará as pulsacións repetidas rapidamente da mesma tecla"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Límite das teclas de rebote"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Escolle o tempo durante o cal o teu teclado ignorará as pulsacións repetidas"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2 s"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4 s"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0,6 s"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Teclas lentas"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Axusta o tempo que se tarda en activar a pulsación dunha tecla"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Teclas presas"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Preme unha tecla de cada vez para os atallos, en lugar de manter premidas varias"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Teclas para o rato"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Usa o teclado para controlar o punteiro"</string>
+    <!-- no translation found for mouse_reverse_vertical_scrolling (154907817154779952) -->
+    <skip />
+    <!-- no translation found for mouse_reverse_vertical_scrolling_summary (3386655598642587942) -->
+    <skip />
+    <!-- no translation found for mouse_swap_primary_button (3028204969091057207) -->
+    <skip />
+    <!-- no translation found for mouse_swap_primary_button_summary (3276638019321067902) -->
     <skip />
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Atallos de teclado"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Mostra a lista de atallos"</string>
@@ -2034,9 +2035,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Escolle unha nova tecla para <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Accesibilidade do teclado físico"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Teclas presas, teclas de rebote, teclas para o rato"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Deseño: <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Predeterminado"</string>
@@ -2987,6 +2992,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Queres desconectar esta VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Desconectar"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versión"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Esquecer perfil da VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Queres substituír a VPN existente?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Queres definir a VPN como sempre activa?"</string>
@@ -5462,13 +5469,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Buscar en Configuración"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"contactos, almacenamento, conta"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Almacenamento de contactos"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Só dispositivo"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Os novos contactos non se sincronizarán cunha conta"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"De forma predeterminada, os contactos gardaranse no teu dispositivo e sincronizaranse coa túa conta"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Non se definiu ningunha conta predeterminada"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Engade unha conta para comezar"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-gu/arrays.xml b/res/values-gu/arrays.xml
index bdd9ff1..06e23f9 100644
--- a/res/values-gu/arrays.xml
+++ b/res/values-gu/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"બ્રીફકેસ"</item>
-    <item msgid="184985872234062767">"ક્લાસિકલ બિલ્ડિંગ"</item>
-    <item msgid="9189550412466785530">"અપાર્ટમેન્ટ બિલ્ડિંગ"</item>
-    <item msgid="2142527562511049422">"સ્પીચ બબલ"</item>
-    <item msgid="2548100558260478605">"લોકોનું ગ્રૂપ"</item>
-    <item msgid="2270003903304578284">"લાઇટ બલ્બ"</item>
-    <item msgid="4793496619091161864">"કૅલેન્ડર"</item>
-    <item msgid="5673625795644364100">"ખલેલ પાડશો નહીં"</item>
-    <item msgid="1423820834865831361">"દોડતી વ્યક્તિ"</item>
-    <item msgid="2037298830718732608">"ગોલ્ફ"</item>
-    <item msgid="2197835014443491074">"જિમ ડમ્બબેલ"</item>
-    <item msgid="2730180105015616518">"સ્વિમિંગ"</item>
-    <item msgid="2666922823253345958">"હાઇક કરતી વ્યક્તિ"</item>
-    <item msgid="8234880356472211396">"બૉલ ફેંકતી વ્યક્તિ"</item>
-    <item msgid="4642980625253001443">"લાત મારતી વ્યક્તિ"</item>
-    <item msgid="4324795269518833500">"ગેમ કન્ટ્રોલર"</item>
-    <item msgid="7789966425125441125">"કલાકારના વિવિધ રંગ"</item>
-    <item msgid="663512680597461570">"સ્નોફ્લૅક"</item>
-    <item msgid="7952183800501346803">"બીચ પરની છત્રી"</item>
-    <item msgid="799139025758265891">"વર્કશોપ ટૂલ"</item>
-    <item msgid="1330084588359129896">"તંબુ"</item>
-    <item msgid="3861584909935022342">"ફિલ્મ રીલ"</item>
-    <item msgid="5827426100157335512">"પુસ્તક"</item>
-    <item msgid="8585828346253128384">"કમળનું ફૂલ"</item>
-    <item msgid="8788370542815300188">"વ્યક્તિનું મગજ"</item>
-    <item msgid="7287354964767553293">"હૅડફોન"</item>
-    <item msgid="2530059623783800987">"ટીવી"</item>
-    <item msgid="5307182323469376758">"ટ્રેન"</item>
-    <item msgid="4903790544026923026">"કાર"</item>
-    <item msgid="5010405583912314582">"છરી કાંટાવાળી ચમચી અને છરી"</item>
-    <item msgid="8939998598599064900">"શૉપિંગ કાર્ટ"</item>
-    <item msgid="3379605903308731893">"બાળક"</item>
-    <item msgid="7808668968550293112">"પ્રાણીનો પંજો"</item>
-    <item msgid="1000692647524056504">"સ્ટાર બૅજ"</item>
-    <item msgid="8270261073421676502">"બે લોકો"</item>
-    <item msgid="5767782819651505460">"સ્ટાર"</item>
-    <item msgid="4368451291862729334">"હૃદય"</item>
-    <item msgid="2613199102208419986">"ઘર"</item>
-    <item msgid="3022279986430275040">"અર્ધચંદ્ર"</item>
-    <item msgid="5421089790869483206">"ઘડિયાળ"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 84e4b26..1800d72 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"તમારું નેટવર્ક અને વાયરલેસ સિગ્નલ વડે ઑટોમૅટિક રીતે સેટ કરેલું સેટિંગ"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"ઑટોમૅટિક ટાઇમ ઝોન"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"તમારી નજીકના મોબાઇલ નેટવર્કના આધારે ઑટોમૅટિક રીતે સેટ કરેલું સેટિંગ"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"ઉપલબ્ધ હોવા પર ડિવાઇસના લોકેશન વડે ઑટો સેટ કરો. કોઈ સક્રિય વાઇ-ફાઇ કનેક્શન હોવું આવશ્યક હોઈ શકે છે."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"ડિફૉલ્ટ લોકેલનો ઉપયોગ કરો"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-કલાક ફોર્મેટનો ઉપયોગ કરો"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"સમય"</string>
@@ -1698,7 +1699,7 @@
     <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="9086039918921009380">"ચહેરા અથવા ફિંગરપ્રિન્ટનો ઉપયોગ કરવા માટે પિન સેટ કરો"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"તમારો પાસવર્ડ ભૂલી ગયાં?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"તમારા પૅટર્નને ભૂલી ગયાં?"</string>
-    <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"તમારો પિન ભૂલી ગયાં?"</string>
+    <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"તમારો પિન ભૂલી ગયા?"</string>
     <string name="lockpassword_confirm_your_pattern_generic" msgid="7401165571170203743">"ચાલુ રાખવા માટે તમારી પૅટર્ન દોરો"</string>
     <string name="lockpassword_confirm_your_pin_generic" msgid="8990266101852808091">"ચાલુ રાખવા માટે તમારો પિન દાખલ કરો"</string>
     <string name="lockpassword_confirm_your_password_generic" msgid="8823867445451497224">"ચાલુ રાખવા માટે તમારો પાસવર્ડ દાખલ કરો"</string>
@@ -1958,6 +1959,10 @@
     <string name="sticky_keys_summary" msgid="1844953803625480623">"શૉર્ટકટ માટે કીને એકસાથે દબાવી રાખવાને બદલે એક સમયે એક જ કી દબાવો"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"માઉસની કી"</string>
     <string name="mouse_keys_summary" msgid="7030731235143286467">"પૉઇન્ટરનું નિયંત્રણ કરવા માટે, તમારા કીબોર્ડનો ઉપયોગ કરો"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"માઉસનું રિવર્સ સ્ક્રોલિંગ"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"પેજને નીચે લઈ જવા માટે ઉપર સ્ક્રોલ કરો"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"ડાબા અને જમણા બટનને સ્વૉપ કરો"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"માઉસના ડાબા બટનનો ઉપયોગ તમારા જમણા બટન તરીકે કરો"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"કીબોર્ડ શૉર્ટકટ"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"શૉર્ટકટની સૂચિ બતાવો"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"કાર્યાલયનું પ્રોફાઇલ અને સાધનો"</string>
@@ -2026,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> માટે નવી કી પસંદ કરો:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"વાસ્તવિક કીબોર્ડની ઍક્સેસિબિલિટી"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"સ્ટીકી કી, બાઉન્સ કી, માઉસ કી"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> લેઆઉટ"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ડિફૉલ્ટ"</string>
@@ -2434,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"પ્રીવ્યૂ"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"સ્ટૅન્ડર્ડ વિકલ્પો"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"ભાષા"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"કૅપ્શનનું કદ"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"કૅપ્શન શૈલી"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"કસ્ટમ વિકલ્પો"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"બૅકગ્રાઉન્ડ રંગ"</string>
@@ -2979,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"આ VPNને ડિસ્કનેક્ટ કરીએ?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"ડિસ્કનેક્ટ કરો"</string>
     <string name="vpn_version" msgid="6344167191984400976">"વર્ઝન"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN ભૂલી ગયાં"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"અસ્તિત્વમાંની VPN ને બદલીએ?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"હંમેશાં ચાલુ VPN સેટ કરીએ?"</string>
@@ -5459,4 +5469,8 @@
     <string name="contacts_storage_selection_message" msgid="8082077300632059003">"ડિફૉલ્ટ તરીકે, સંપર્કોને તમારા ડિવાઇસમાં સાચવવામાં આવશે અને તેને તમારા એકાઉન્ટ સાથે સિંક કરવામાં આવશે"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"કોઈ ડિફૉલ્ટ સેટ નથી"</string>
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"શરૂ કરવા માટે કોઈ એકાઉન્ટ ઉમેરો"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
+    <skip />
 </resources>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index 0ff7011..3b7767f 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"ब्रीफ़केस"</item>
-    <item msgid="184985872234062767">"क्लासिकल बिल्डिंग"</item>
-    <item msgid="9189550412466785530">"अपार्टमेंट बिल्डिंग"</item>
-    <item msgid="2142527562511049422">"स्पीच बबल"</item>
-    <item msgid="2548100558260478605">"लोगों का ग्रुप"</item>
-    <item msgid="2270003903304578284">"बल्ब"</item>
-    <item msgid="4793496619091161864">"कैलेंडर"</item>
-    <item msgid="5673625795644364100">"परेशान न करें"</item>
-    <item msgid="1423820834865831361">"दौड़ता हुआ व्यक्ति"</item>
-    <item msgid="2037298830718732608">"गॉल्फ़"</item>
-    <item msgid="2197835014443491074">"जिम डंबल"</item>
-    <item msgid="2730180105015616518">"तैराकी"</item>
-    <item msgid="2666922823253345958">"पैदल चलता हुआ व्यक्ति"</item>
-    <item msgid="8234880356472211396">"बॉल फेंकता हुआ व्यक्ति"</item>
-    <item msgid="4642980625253001443">"किक मारता हुआ व्यक्ति"</item>
-    <item msgid="4324795269518833500">"गेम कंट्रोलर"</item>
-    <item msgid="7789966425125441125">"कलाकार के लिए रंग पटल"</item>
-    <item msgid="663512680597461570">"स्नोफ़्लेक"</item>
-    <item msgid="7952183800501346803">"बीच अंब्रेला"</item>
-    <item msgid="799139025758265891">"वर्कशॉप टूल"</item>
-    <item msgid="1330084588359129896">"टेंट"</item>
-    <item msgid="3861584909935022342">"फ़िल्म रील"</item>
-    <item msgid="5827426100157335512">"किताब"</item>
-    <item msgid="8585828346253128384">"कमल का फूल"</item>
-    <item msgid="8788370542815300188">"व्यक्ति का दिमाग"</item>
-    <item msgid="7287354964767553293">"हेडफ़ोन"</item>
-    <item msgid="2530059623783800987">"टीवी"</item>
-    <item msgid="5307182323469376758">"ट्रेन"</item>
-    <item msgid="4903790544026923026">"कार"</item>
-    <item msgid="5010405583912314582">"कांटा और चाकू"</item>
-    <item msgid="8939998598599064900">"शॉपिंग कार्ट"</item>
-    <item msgid="3379605903308731893">"बच्चा"</item>
-    <item msgid="7808668968550293112">"जानवर का पंजा"</item>
-    <item msgid="1000692647524056504">"स्टार बैज"</item>
-    <item msgid="8270261073421676502">"दो लोग"</item>
-    <item msgid="5767782819651505460">"स्टार"</item>
-    <item msgid="4368451291862729334">"दिल"</item>
-    <item msgid="2613199102208419986">"घर"</item>
-    <item msgid="3022279986430275040">"हाफ़-मून"</item>
-    <item msgid="5421089790869483206">"घड़ी"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index eb6ede7..6905be2 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"नेटवर्क और वायरलेस सिग्नल के ज़रिए तारीख और समय अपने-आप सेट होने की सुविधा पाएं"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"टाइम ज़ोन अपने-आप सेट होने की सुविधा"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"अपने आस-पास के मोबाइल नेटवर्क के मुताबिक तारीख और समय अपने-आप सेट होने की सुविधा पाएं"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"डिवाइस की जगह के हिसाब से समय और तारीख अपने-आप सेट होने की सुविधा पाएं. इसमें वाई-फ़ाई की ज़रूरत पड़ सकती है."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"जगह और भाषा के हिसाब से समय का फ़ॉर्मैट सेट करें"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-घंटे वाले फ़ॉर्मैट का इस्तेमाल करें"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"समय"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"सुलभता सुविधा"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"सामान्य कीबोर्ड"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"बाउंस बटन"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"एक ही बटन को बार-बार दबाने पर, कीबोर्ड तुरंत कोई कार्रवाई नहीं करेगा"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"बाउंस बटन का थ्रेशोल्ड"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"चुनें कि किसी बटन को कितनी देर तक बार-बार दबाने पर कीबोर्ड कोई कार्रवाई नहीं करेगा"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0.2 सेकंड"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0.4 सेकंड"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0.6 सेकंड"</string>
     <string name="slow_keys" msgid="2891452895499690837">"स्लो बटन"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"किसी बटन को दबाने पर स्क्रीन पर होने वाली प्रतिक्रिया के समय में बदलाव करें"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"स्टिकी बटन"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"शॉर्टकट के लिए, कई कुंजियों को एक साथ दबाकर रखने के बजाय एक बार में एक कुंजी दबाएं"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"माउस का काम करने वाले बटन"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"पॉइंटर को कंट्रोल करने के लिए, कीबोर्ड का इस्तेमाल करें"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"माउस रिवर्स स्क्रोलिंग"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"पेज को नीचे ले जाने के लिए, ऊपर की ओर स्क्रोल करें"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"बाएं और दाएं बटन स्वैप करें"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"माउस के बाएं बटन को दाएं बटन की तरह इस्तेमाल करें"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"कीबोर्ड शॉर्टकट"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"शॉर्टकट की सूची दिखाएं"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"काम के प्रोफ़ाइल से जुड़े कीबोर्ड और टूल"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> के लिए, कोई नई कुंजी चुनें:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"फ़िज़िकल कीबोर्ड की सुलभता सेटिंग"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"स्टिकी बटन, बाउंस बटन, माउस बटन"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> का लेआउट"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"डिफ़ॉल्ट"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"झलक"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"मानक विकल्प"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"भाषा"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"कैप्शन का साइज़"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"कैप्शन की स्टाइल"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"आपके मुताबिक विकल्प"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"पृष्ठभूमि का रंग"</string>
@@ -2883,7 +2883,7 @@
     <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>
-    <string name="sync_enabled" msgid="5794103781356455043">"समन्वयन चालू है"</string>
+    <string name="sync_enabled" msgid="5794103781356455043">"सिंक करने की सेटिंग चालू है"</string>
     <string name="sync_disabled" msgid="1636223106968593391">"सिंक बंद है"</string>
     <string name="sync_error" msgid="846923369794727644">"समन्वयन गड़बड़ी"</string>
     <string name="last_synced" msgid="1527008461298110443">"पिछली बार सिंक करने का समय: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"इस VPN को डिसकनेक्ट करना चाहते हैं?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"डिसकनेक्ट करें"</string>
     <string name="vpn_version" msgid="6344167191984400976">"वर्शन"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"इस वीपीएन नेटवर्क को हटाएं"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"मौजूदा वीपीएन को बदलें?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"हमेशा-चालू VPN सेट करें?"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"सेटिंग खोजें"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"संपर्क, स्टोरेज, खाता"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"संपर्क स्टोरेज"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"संपर्क सिर्फ़ डिवाइस में सेव करें"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"नए संपर्क किसी खाते से सिंक नहीं किए जाएंगे"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"डिफ़ॉल्ट रूप से, संपर्क आपके डिवाइस में सेव हो जाएंगे और आपके खाते से सिंक हो जाएंगे"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"डिफ़ॉल्ट खाता सेट नहीं किया गया है"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"सिंक करने के लिए कोई खाता जोड़ें"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 3af0878..2262c33 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Aktovka"</item>
-    <item msgid="184985872234062767">"Klasična zgrada"</item>
-    <item msgid="9189550412466785530">"Stambena zgrada"</item>
-    <item msgid="2142527562511049422">"Govorni oblačić"</item>
-    <item msgid="2548100558260478605">"Grupa ljudi"</item>
-    <item msgid="2270003903304578284">"Žarulja"</item>
-    <item msgid="4793496619091161864">"Kalendar"</item>
-    <item msgid="5673625795644364100">"Ne uznemiravaj"</item>
-    <item msgid="1423820834865831361">"Osoba trči"</item>
-    <item msgid="2037298830718732608">"Golf"</item>
-    <item msgid="2197835014443491074">"Bučica za teretanu"</item>
-    <item msgid="2730180105015616518">"Plivanje"</item>
-    <item msgid="2666922823253345958">"Osoba pješači"</item>
-    <item msgid="8234880356472211396">"Osoba baca loptu"</item>
-    <item msgid="4642980625253001443">"Osoba udara"</item>
-    <item msgid="4324795269518833500">"Kontroler za videoigre"</item>
-    <item msgid="7789966425125441125">"Umjetnička paleta boja"</item>
-    <item msgid="663512680597461570">"Snježna pahuljica"</item>
-    <item msgid="7952183800501346803">"Suncobran za plažu"</item>
-    <item msgid="799139025758265891">"Radionički alati"</item>
-    <item msgid="1330084588359129896">"Šator"</item>
-    <item msgid="3861584909935022342">"Filmska vrpca"</item>
-    <item msgid="5827426100157335512">"Knjiga"</item>
-    <item msgid="8585828346253128384">"Lotosov cvijet"</item>
-    <item msgid="8788370542815300188">"Um osobe"</item>
-    <item msgid="7287354964767553293">"Slušalice"</item>
-    <item msgid="2530059623783800987">"TV"</item>
-    <item msgid="5307182323469376758">"Vlak"</item>
-    <item msgid="4903790544026923026">"Automobil"</item>
-    <item msgid="5010405583912314582">"Vilica i nož"</item>
-    <item msgid="8939998598599064900">"Košarica"</item>
-    <item msgid="3379605903308731893">"Dijete"</item>
-    <item msgid="7808668968550293112">"Životinjska šapa"</item>
-    <item msgid="1000692647524056504">"Značka sa zvjezdicom"</item>
-    <item msgid="8270261073421676502">"Dvije osobe"</item>
-    <item msgid="5767782819651505460">"Zvijezda"</item>
-    <item msgid="4368451291862729334">"Srce"</item>
-    <item msgid="2613199102208419986">"Kuća"</item>
-    <item msgid="3022279986430275040">"Polumjesec"</item>
-    <item msgid="5421089790869483206">"Sat"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 0e4123c..67290cd 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Postavi automatski pomoću mreže i bežičnih signala"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Automatska vremenska zona"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Automatski postavi na temelju mobilnih mreža u blizini"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Postavi automatski pomoću lokacije uređaja, ako je dostupna. Možda je potrebna i aktivna Wi-Fi veza."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Koristi zadani lokalni format"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Koristi 24-satni format"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Vrijeme"</string>
@@ -1958,6 +1959,10 @@
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Pritisnite jednu po jednu tipku za prečace umjesto da ih pritisnete zajedno"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Tipke miša"</string>
     <string name="mouse_keys_summary" msgid="7030731235143286467">"Upravljajte pokazivačem pomoću tipkovnice"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Obrnuto pomicanje pomoću miša"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Pomičite se prema gore za pomicanje stranice prema dolje"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Zamjena lijeve i desne tipke"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Upotrebljavajte lijevu tipku miša kao desnu"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Tipkovni prečaci"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Prikaži popis prečaca"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Tipkovnice i alati radnog profila"</string>
@@ -2026,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Odaberite novu tipku za <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Pristupačnost fizičke tipkovnice"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Ljepljive tipke, sprečavanje slučajnih pritisaka tipki, tipke miša"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Izgled: <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Zadano"</string>
@@ -2434,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Pregled"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standardne opcije"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Jezik"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Veličina titlova"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Stil titlova"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Prilagođene opcije"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Boja pozadine"</string>
@@ -2979,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Prekinuti vezu s VPN-om?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Prekini vezu"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Verzija"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Zaboravi VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Želite li zamijeniti dosadašnji VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Želite li postaviti uvijek uključeni VPN?"</string>
@@ -4395,7 +4405,7 @@
     <string name="dark_theme_slice_title" msgid="4684222119481114062">"Isprobajte Tamnu temu"</string>
     <string name="dark_theme_slice_subtitle" msgid="5555724345330434268">"Pomaže produljiti trajanje baterije"</string>
     <string name="quick_settings_developer_tiles" msgid="7336007844525766623">"Pločice brzih postavki za razvojne programere"</string>
-    <string name="adb_authorization_timeout_title" msgid="6996844506783749754">"Onemogući vrijeme čekanja za autorizacije za adb"</string>
+    <string name="adb_authorization_timeout_title" msgid="6996844506783749754">"Onemogući istek vremena za autorizaciju ADB-a"</string>
     <string name="adb_authorization_timeout_summary" msgid="409931540424019778">"Onemogućite automatski opoziv autorizacija za adb za sustave koji se ne povežu u zadanom razdoblju (sedam dana) ili korisnički konfiguriranom razdoblju (najmanje jedan dan)."</string>
     <string name="sensors_off_quick_settings_title" msgid="8472151847125917167">"Senzori su isključeni"</string>
     <string name="managed_profile_settings_title" msgid="3400923723423564217">"Postavke poslovnog profila"</string>
@@ -5460,4 +5470,8 @@
     <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kontakti će se spremiti na vaš uređaj i prema zadanim postavkama sinkronizirati s vašim računom"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Nema zadane postavke"</string>
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Dodajte račun da biste započeli"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
+    <skip />
 </resources>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index d6002b8..042b900 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Aktatáska"</item>
-    <item msgid="184985872234062767">"Klasszikus épület"</item>
-    <item msgid="9189550412466785530">"Társasház"</item>
-    <item msgid="2142527562511049422">"Szövegbuborék"</item>
-    <item msgid="2548100558260478605">"Emberek csoportja"</item>
-    <item msgid="2270003903304578284">"Izzó"</item>
-    <item msgid="4793496619091161864">"Naptár"</item>
-    <item msgid="5673625795644364100">"Ne zavarjanak"</item>
-    <item msgid="1423820834865831361">"Futó ember"</item>
-    <item msgid="2037298830718732608">"Golf"</item>
-    <item msgid="2197835014443491074">"Edzőtermi súlyzó"</item>
-    <item msgid="2730180105015616518">"Úszás"</item>
-    <item msgid="2666922823253345958">"Túrázó ember"</item>
-    <item msgid="8234880356472211396">"Labdát dobó ember"</item>
-    <item msgid="4642980625253001443">"Rúgó ember"</item>
-    <item msgid="4324795269518833500">"Kontroller"</item>
-    <item msgid="7789966425125441125">"Festő színpalettája"</item>
-    <item msgid="663512680597461570">"Hópehely"</item>
-    <item msgid="7952183800501346803">"Strandernyő"</item>
-    <item msgid="799139025758265891">"Workshop-eszközök"</item>
-    <item msgid="1330084588359129896">"Sátor"</item>
-    <item msgid="3861584909935022342">"Filmtekercs"</item>
-    <item msgid="5827426100157335512">"Könyv"</item>
-    <item msgid="8585828346253128384">"Lótuszvirág"</item>
-    <item msgid="8788370542815300188">"Emberi elme"</item>
-    <item msgid="7287354964767553293">"Fejhallgató"</item>
-    <item msgid="2530059623783800987">"TV"</item>
-    <item msgid="5307182323469376758">"Vonat"</item>
-    <item msgid="4903790544026923026">"Autó"</item>
-    <item msgid="5010405583912314582">"Kés és villa"</item>
-    <item msgid="8939998598599064900">"Bevásárlókosár"</item>
-    <item msgid="3379605903308731893">"Gyermek"</item>
-    <item msgid="7808668968550293112">"Állati mancs"</item>
-    <item msgid="1000692647524056504">"Csillag jelvény"</item>
-    <item msgid="8270261073421676502">"Két ember"</item>
-    <item msgid="5767782819651505460">"Csillag"</item>
-    <item msgid="4368451291862729334">"Szív"</item>
-    <item msgid="2613199102208419986">"Ház"</item>
-    <item msgid="3022279986430275040">"Félhold"</item>
-    <item msgid="5421089790869483206">"Óra"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 26bb57c..bcef2a3 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Automatikus beállítás a hálózat és a vezeték nélküli jelek alapján"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Automatikus időzóna"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Automatikus beállítás a közeli mobilhálózatok alapján"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Automatikus beállítás az eszköz helyadatai alapján (ha rendelkezésre állnak). Aktív Wi-Fi-re is szükség lehet."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Helyi alapértelmezés használata"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24 órás formátum használata"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Idő"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Kisegítő lehetőségek"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Fizikai billentyűzet"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Billentyűblokkolás"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"A billentyűzet nem veszi figyelembe, ha ugyanazt a billentyűt gyorsan egymás után többször is lenyomja."</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Billentyűblokkolás küszöbértéke"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Válassza ki, hogy a billentyűzet mennyi ideig hagyja figyelmen kívül az ismétlődő gombnyomásokat."</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2 mp"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4 mp"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0,6 mp"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Lassú billentyűk"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Módosítja a billentyű lenyomásától az aktiválásig eltelő időtartamot."</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Beragadó billentyűk"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Egyszerre egy billentyű lenyomásával használhat billentyűparancsokat több billentyű egyszeri lenyomva tartása helyett"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Egérgombok"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"A billentyűzettel vezérelheti a mutatót."</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Fordított görgetés az egérrel"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Az oldal lefelé mozgatásához görgessen felfelé"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Bal és jobb gomb felcserélése"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"A bal egérgomb használata jobb egérgombként"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Billentyűparancsok"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Billentyűparancsok listájának megjelenítése"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Munkaprofil billentyűzetei és eszközei"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Válasszon új billentyűt a(z) <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> számára:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Fizikai billentyűzet kisegítő lehetőségei"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Beragadó billentyűk, billentyűblokkolás, egérgombok"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> elrendezés"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Alapértelmezett"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Előnézet"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Normál beállítások"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Nyelv"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Felirat mérete"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Felirat stílusa"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Egyéni beállítások"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Háttérszín"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Leválasztja a VPN-t?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Leválasztás"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Verzió"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN elfelejtése"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Lecseréli a meglévő VPN-t?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Beállítja a mindig bekapcsolt VPN-t?"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Keresési beállítások"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"névjegyek, tárhely, fiók"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Névjegytár"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Csak az eszközön"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Az új névjegyeket semmilyen fiókkal nem szinkronizálja a rendszer."</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"A névjegyek alapértelmezés szerint az eszközére lesznek mentve, és szinkronizálódnak a fiókjával."</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Nincs alapértelmezett beállítás"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"A kezdéshez adjon hozzá egy fiókot."</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-hy/arrays.xml b/res/values-hy/arrays.xml
index b64125d..836e930 100644
--- a/res/values-hy/arrays.xml
+++ b/res/values-hy/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Թղթապանակ"</item>
-    <item msgid="184985872234062767">"Դասական շենք"</item>
-    <item msgid="9189550412466785530">"Բազմաբնակարան շենք"</item>
-    <item msgid="2142527562511049422">"Խոսքի պղպջակ"</item>
-    <item msgid="2548100558260478605">"Մարդկանց խումբ"</item>
-    <item msgid="2270003903304578284">"էլեկտրական լամպ"</item>
-    <item msgid="4793496619091161864">"Օրացույց"</item>
-    <item msgid="5673625795644364100">"Չանհանգստացնել"</item>
-    <item msgid="1423820834865831361">"Վազող մարդ"</item>
-    <item msgid="2037298830718732608">"Գոլֆ"</item>
-    <item msgid="2197835014443491074">"Հանտել"</item>
-    <item msgid="2730180105015616518">"Լող"</item>
-    <item msgid="2666922823253345958">"Քայլարշավի մասնակցող մարդ"</item>
-    <item msgid="8234880356472211396">"Գնդակ նետող մարդ"</item>
-    <item msgid="4642980625253001443">"Ոտքով հարվածող մարդ"</item>
-    <item msgid="4324795269518833500">"Խաղային բարձակ"</item>
-    <item msgid="7789966425125441125">"Նկարչական գունապնակ"</item>
-    <item msgid="663512680597461570">"Ձյան փաթիլ"</item>
-    <item msgid="7952183800501346803">"Լողափի հովանոց"</item>
-    <item msgid="799139025758265891">"Արհեստանոցի գործիքներ"</item>
-    <item msgid="1330084588359129896">"Վրան"</item>
-    <item msgid="3861584909935022342">"Ֆիլմի սյուժե"</item>
-    <item msgid="5827426100157335512">"Գիրք"</item>
-    <item msgid="8585828346253128384">"Լոտոսի ծաղիկ"</item>
-    <item msgid="8788370542815300188">"Մարդու միտքը"</item>
-    <item msgid="7287354964767553293">"Ականջակալներ"</item>
-    <item msgid="2530059623783800987">"Հեռուստացույց"</item>
-    <item msgid="5307182323469376758">"Գնացք"</item>
-    <item msgid="4903790544026923026">"Ավտոմեքենա"</item>
-    <item msgid="5010405583912314582">"Դանակ և պատառաքաղ"</item>
-    <item msgid="8939998598599064900">"Գնումների զամբյուղ"</item>
-    <item msgid="3379605903308731893">"Երեխա"</item>
-    <item msgid="7808668968550293112">"Կենդանու թաթ"</item>
-    <item msgid="1000692647524056504">"Աստղանիշի նշանակ"</item>
-    <item msgid="8270261073421676502">"Երկու մարդ"</item>
-    <item msgid="5767782819651505460">"Աստղ"</item>
-    <item msgid="4368451291862729334">"Սիրտ"</item>
-    <item msgid="2613199102208419986">"Տուն"</item>
-    <item msgid="3022279986430275040">"Կիսալուսին"</item>
-    <item msgid="5421089790869483206">"Ժամացույց"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 9994576..bb87f85 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Ավտոմատ կարգավորել՝ օգտագործելով ցանցը և անլար ազդանշանները"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Ժամային գոտու ավտոմատ որոշում"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Ավտոմատ սահմանել՝ հիմնվելով ձեր մոտակայքում գործող բջջային ցանցերի վրա"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Ավտոմատ կարգավորել՝ օգտագործելով սարքի տեղադրությունը, եթե առկա է։ Կարող է նաև պահանջվել Wi-Fi կապ։"</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Օգտագործել կանխադրված տեղույթը"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Օգտագործել 24-ժամյա ձևաչափը"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Ժամը"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Հատուկ գործառույթներ"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Ֆիզիկական ստեղնաշար"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Կրկնակի սեղմման անտեսում"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Ստեղնաշարը անտեսում է միևնույն ստեղնի կրկնվող արագ սեղմումները"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Կրկնվող սեղմումների անտեսման շեմ"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Ընտրեք, թե որքան ժամանակ պետք է անտեսվեն ստեղնաշարի ստեղների կրկնվող սեղմումները"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2 վ"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4 վ"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0,6 վ"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Դանդաղ ստեղներ"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Կարգավորում է ժամանակի տևողությունը, որից հետո ստեղնը արձագանքում է սեղմմանը"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Կպչուն ստեղներ"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Դյուրանցումների համար միաժամանակ սեղմեք մեկ ստեղն, այլ ոչ թե միասին սեղմած պահեք մի քանիսը"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Մկնիկի ստեղներ"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Ցուցիչը կառավարել ստեղնաշարի միջոցով"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Մկնիկով հետադարձ ոլորում"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Ոլորեք վերև՝ էջի ներքև անցնելու համար"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Տեղերով փոխել աջ և ձախ կոճակները"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Օգտագործեք մկնիկի ձախ կոճակը որպես աջը"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Ստեղնային դյուրանցումներ"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Ցույց տալ ստեղնաշարի դյուրանցումների ցանկը"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Աշխատանքային պրոֆիլի ստեղնաշարեր և գործիքներ"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Ընտրել նոր ստեղն <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> ստեղնի փոխարեն՝"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Ֆիզիկական ստեղնաշարի հատուկ գործառույթներ"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Կպչուն ստեղներ, Վերադարձի ստեղներ, Մկնիկի ստեղներ"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> դասավորություն"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Կանխադրված"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Նախադիտում"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Սովորական ընտրանքներ"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Լեզու"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Ենթագրերի չափսը"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Ենթագրերի ոճը"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Հատուկ ընտրանքներ"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Ֆոնի գույնը"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Անջատե՞լ այս VPN-ը:"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Անջատել"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Տարբերակ"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Մոռանալ VPN-ը"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Փոխարինե՞լ ընթացիկ VPN-ը:"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Սահմանե՞լ որպես «միշտ միացված» VPN:"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Որոնեք կարգավորումներում"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"կոնտակտներ, տարածք, հաշիվ"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Կոնտակտների տարածք"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Միայն սարքում"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Նոր կոնտակտները չեն համաժամացվի հաշվի հետ"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Կոնտակտներն ըստ կանխադրման կպահվեն սարքում և կհամաժամացվեն ձեր հաշվի հետ"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Որևէ հաշիվ սահմանված չէ որպես կանխադրված"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Սկսելու համար ավելացրեք հաշիվ"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index 55f7adf..9cd16c3 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Tas kantor"</item>
-    <item msgid="184985872234062767">"Bangunan klasik"</item>
-    <item msgid="9189550412466785530">"Gedung apartemen"</item>
-    <item msgid="2142527562511049422">"Balon kata-kata"</item>
-    <item msgid="2548100558260478605">"Sekelompok orang"</item>
-    <item msgid="2270003903304578284">"Bohlam"</item>
-    <item msgid="4793496619091161864">"Kalender"</item>
-    <item msgid="5673625795644364100">"Jangan Ganggu"</item>
-    <item msgid="1423820834865831361">"Orang berlari"</item>
-    <item msgid="2037298830718732608">"Golf"</item>
-    <item msgid="2197835014443491074">"Barbel gym"</item>
-    <item msgid="2730180105015616518">"Renang"</item>
-    <item msgid="2666922823253345958">"Seseorang mendaki"</item>
-    <item msgid="8234880356472211396">"Seseorang melempar bola"</item>
-    <item msgid="4642980625253001443">"Seseorang menendang"</item>
-    <item msgid="4324795269518833500">"Controller game"</item>
-    <item msgid="7789966425125441125">"Palet warna seniman"</item>
-    <item msgid="663512680597461570">"Kepingan salju"</item>
-    <item msgid="7952183800501346803">"Payung pantai"</item>
-    <item msgid="799139025758265891">"Alat workshop"</item>
-    <item msgid="1330084588359129896">"Tenda"</item>
-    <item msgid="3861584909935022342">"Rol film"</item>
-    <item msgid="5827426100157335512">"Buku"</item>
-    <item msgid="8585828346253128384">"Bunga teratai"</item>
-    <item msgid="8788370542815300188">"Pikiran seseorang"</item>
-    <item msgid="7287354964767553293">"Headphone"</item>
-    <item msgid="2530059623783800987">"TV"</item>
-    <item msgid="5307182323469376758">"Kereta"</item>
-    <item msgid="4903790544026923026">"Mobil"</item>
-    <item msgid="5010405583912314582">"Garpu dan pisau"</item>
-    <item msgid="8939998598599064900">"Keranjang belanja"</item>
-    <item msgid="3379605903308731893">"Anak"</item>
-    <item msgid="7808668968550293112">"Cakar hewan"</item>
-    <item msgid="1000692647524056504">"Badge bintang"</item>
-    <item msgid="8270261073421676502">"Dua orang"</item>
-    <item msgid="5767782819651505460">"Bintang"</item>
-    <item msgid="4368451291862729334">"Hati"</item>
-    <item msgid="2613199102208419986">"Rumah"</item>
-    <item msgid="3022279986430275040">"Bulan sabit"</item>
-    <item msgid="5421089790869483206">"Jam"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index a8bea08..6bda374 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Setel secara otomatis menggunakan jaringan dan sinyal nirkabel Anda"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Zona waktu otomatis"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Setel otomatis berdasarkan jaringan seluler di sekitar Anda"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Setel secara otomatis menggunakan lokasi perangkat, jika tersedia. Koneksi Wi-Fi yang aktif juga mungkin diperlukan."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Gunakan default lokalitas"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Gunakan format 24 jam"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Waktu"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Aksesibilitas"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Keyboard fisik"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Tombol pantul"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Keyboard mengabaikan penekanan tombol yang sama secara berulang dan cepat"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Batas tombol pantul"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Pilih durasi waktu keyboard Anda mengabaikan penekanan tombol berulang"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2 dtk"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4 dtk"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0,6 dtk"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Tombol lambat"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Menyesuaikan waktu yang diperlukan penekanan tombol untuk diaktifkan"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Tombol lekat"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Tekan satu tombol pada satu waktu untuk mengaktifkan pintasan, bukan menekan tombol secara bersamaan"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Tombol mouse"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Gunakan keyboard untuk mengontrol kursor"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Scroll terbalik mouse"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Scroll ke atas untuk memindahkan halaman ke bawah"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Tukar tombol kiri dan kanan"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Gunakan tombol mouse kiri sebagai tombol kanan"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Pintasan keyboard"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Tampilkan daftar pintasan"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Keyboard &amp; fitur profil kerja"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Pilih tombol baru untuk <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Aksesibilitas keyboard fisik"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Tombol lekat, Tombol pantul, Tombol mouse"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Tata letak <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Default"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Pratinjau"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Opsi standar"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Bahasa"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Ukuran teks"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Gaya teks"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Opsi khusus"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Warna latar belakang"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Putuskan sambungan VPN ini?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Putuskan koneksi"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versi"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Lupakan VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Ganti VPN yang sudah ada?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Setel VPN selalu aktif?"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Telusuri Setelan"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"kontak, penyimpanan, akun"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Penyimpanan kontak"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Perangkat saja"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Kontak baru tidak akan disinkronkan dengan akun"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kontak akan disimpan ke perangkat dan disinkronkan ke akun Anda secara default"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Tidak ada default yang disetel"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Tambahkan akun untuk memulai"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-is/arrays.xml b/res/values-is/arrays.xml
index eacf406..6d70ab2 100644
--- a/res/values-is/arrays.xml
+++ b/res/values-is/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Skjalataska"</item>
-    <item msgid="184985872234062767">"Klassísk bygging"</item>
-    <item msgid="9189550412466785530">"Íbúðarhús"</item>
-    <item msgid="2142527562511049422">"Talblaðra"</item>
-    <item msgid="2548100558260478605">"Hópur fólks"</item>
-    <item msgid="2270003903304578284">"Ljósapera"</item>
-    <item msgid="4793496619091161864">"Dagatal"</item>
-    <item msgid="5673625795644364100">"Ónáðið ekki"</item>
-    <item msgid="1423820834865831361">"Manneskja að hlaupa"</item>
-    <item msgid="2037298830718732608">"Golf"</item>
-    <item msgid="2197835014443491074">"Líkamsræktarlóð"</item>
-    <item msgid="2730180105015616518">"Sund"</item>
-    <item msgid="2666922823253345958">"Manneskja í fjallgöngu"</item>
-    <item msgid="8234880356472211396">"Manneskja hendir bolta"</item>
-    <item msgid="4642980625253001443">"Manneskja sparkar"</item>
-    <item msgid="4324795269518833500">"Leikjafjarstýring"</item>
-    <item msgid="7789966425125441125">"Litaspjald listamanns"</item>
-    <item msgid="663512680597461570">"Snjókorn"</item>
-    <item msgid="7952183800501346803">"Sólhlíf"</item>
-    <item msgid="799139025758265891">"Verkfæri"</item>
-    <item msgid="1330084588359129896">"Tjald"</item>
-    <item msgid="3861584909935022342">"Gamaldags filma"</item>
-    <item msgid="5827426100157335512">"Bók"</item>
-    <item msgid="8585828346253128384">"Lótusblóm"</item>
-    <item msgid="8788370542815300188">"Hugur manneskju"</item>
-    <item msgid="7287354964767553293">"Heyrnartól"</item>
-    <item msgid="2530059623783800987">"Sjónvarp"</item>
-    <item msgid="5307182323469376758">"Lest"</item>
-    <item msgid="4903790544026923026">"Bíll"</item>
-    <item msgid="5010405583912314582">"Hnífur og gaffall"</item>
-    <item msgid="8939998598599064900">"Innkaupakarfa"</item>
-    <item msgid="3379605903308731893">"Barn"</item>
-    <item msgid="7808668968550293112">"Þófi"</item>
-    <item msgid="1000692647524056504">"Stjörnumerking"</item>
-    <item msgid="8270261073421676502">"Tvær manneskjur"</item>
-    <item msgid="5767782819651505460">"Stjarna"</item>
-    <item msgid="4368451291862729334">"Hjarta"</item>
-    <item msgid="2613199102208419986">"Hús"</item>
-    <item msgid="3022279986430275040">"Hálfmáni"</item>
-    <item msgid="5421089790869483206">"Klukka"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 50610bc..0b34df0 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Stilla sjálfvirkt með því að nota merki netkerfis og þráðlaus merki"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Sjálfvirkt tímabelti"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Stilla sjálfvirkt samkvæmt farsímakerfum nálægt þér"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Stilla sjálfvirkt með því að nota staðsetningu tækis, ef tiltæk. Virkrar Wifi-tengingar kann einnig að vera krafist."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Nota sjálfgefið snið staðar"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Nota 24 tíma snið"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Tími"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Aðgengi"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Vélbúnaðarlyklaborð"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Endurkastslyklar"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Lyklaborðið hunsar þegar þú ýtir snöggt og endurtekið á sama lykilinn"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Mörk endurkastslykils"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Veldu tímann sem lyklaborðið þitt hunsar lykil í þegar þú ýtir endurtekið á hann"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2 sek."</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4 sek."</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0,6 sek."</string>
     <string name="slow_keys" msgid="2891452895499690837">"Hægir lyklar"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Breyttu tímanum sem það tekur fyrir lykil að virkjast eftir að þú ýtir á hann"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Festilyklar"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Ýttu á einn lykil í einu fyrir flýtilykla í staðinn fyrir að halda lyklum saman niðri"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Músarhnappar"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Notaðu lyklaborðið til að stjórna bendlinum"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Öfug fletting músar"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Flettu upp til að færa síðuna niður"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Víxla hægri og vinstri hnappi"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Notaðu vinstri músarhnappinn sem hægri hnapp"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Flýtilyklar"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Sýna lista yfir flýtileiðir"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Lyklaborð og verkfæri vinnusniðs"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Veldu nýjan lykil fyrir <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Aðgengi vélbúnaðarlyklaborðs"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Festilyklar, endurkastslyklar, músarhnappar"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Útlit: <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Sjálfgefið"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Forskoða"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Hefðbundnir valkostir"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Tungumál"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Stærð skjátexta"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Stíll texta"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Sérsniðnir valkostir"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Bakgrunnslitur"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Aftengja þessa VPN-tengingu?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Aftengja"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Útgáfa"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Gleyma VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Skipta út núverandi VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Velja VPN sem alltaf er kveikt á?"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Leitarstillingar"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"tengiliðir, geymsla, reikningur"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Tengiliðageymsla"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Aðeins tæki"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Nýir tengiliðir verða ekki samstilltir við reikning"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Tengiliðir verða sjálfkrafa vistaðir í tækinu þínu og samstilltir við reikninginn þinn"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Ekkert sjálfgildi stillt"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Bættu reikningi við til að hefjast handa"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 7c6fdf1..45d8196 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Valigetta"</item>
-    <item msgid="184985872234062767">"Edificio classico"</item>
-    <item msgid="9189550412466785530">"Condominio"</item>
-    <item msgid="2142527562511049422">"Fumetto"</item>
-    <item msgid="2548100558260478605">"Gruppo di persone"</item>
-    <item msgid="2270003903304578284">"Lampadina"</item>
-    <item msgid="4793496619091161864">"Calendario"</item>
-    <item msgid="5673625795644364100">"Non disturbare"</item>
-    <item msgid="1423820834865831361">"Persona che corre"</item>
-    <item msgid="2037298830718732608">"Golf"</item>
-    <item msgid="2197835014443491074">"Manubrio da palestra"</item>
-    <item msgid="2730180105015616518">"Nuoto"</item>
-    <item msgid="2666922823253345958">"Persona che fa un\'escursione"</item>
-    <item msgid="8234880356472211396">"Persona che lancia una palla"</item>
-    <item msgid="4642980625253001443">"Persona che tira un calcio"</item>
-    <item msgid="4324795269518833500">"Controller di gioco"</item>
-    <item msgid="7789966425125441125">"Tavolozza dei colori da artista"</item>
-    <item msgid="663512680597461570">"Fiocco di neve"</item>
-    <item msgid="7952183800501346803">"Ombrellone da spiaggia"</item>
-    <item msgid="799139025758265891">"Strumenti per il workshop"</item>
-    <item msgid="1330084588359129896">"Tenda"</item>
-    <item msgid="3861584909935022342">"Pellicola"</item>
-    <item msgid="5827426100157335512">"Libro"</item>
-    <item msgid="8585828346253128384">"Fiore di loto"</item>
-    <item msgid="8788370542815300188">"Mente di una persona"</item>
-    <item msgid="7287354964767553293">"Cuffie"</item>
-    <item msgid="2530059623783800987">"TV"</item>
-    <item msgid="5307182323469376758">"Treno"</item>
-    <item msgid="4903790544026923026">"Auto"</item>
-    <item msgid="5010405583912314582">"Forchetta e coltello"</item>
-    <item msgid="8939998598599064900">"Carrello"</item>
-    <item msgid="3379605903308731893">"Figlio"</item>
-    <item msgid="7808668968550293112">"Zampa di animale"</item>
-    <item msgid="1000692647524056504">"Badge a forma di stella"</item>
-    <item msgid="8270261073421676502">"Due persone"</item>
-    <item msgid="5767782819651505460">"Stella"</item>
-    <item msgid="4368451291862729334">"Cuore"</item>
-    <item msgid="2613199102208419986">"Casa"</item>
-    <item msgid="3022279986430275040">"Mezza luna"</item>
-    <item msgid="5421089790869483206">"Orologio"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 398d538..f75c879 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Imposta automaticamente la data e l\'ora utilizzando la rete e gli indicatori wireless"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Fuso orario automatico"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Imposta automaticamente la data e l\'ora in base alle reti mobile nelle tue vicinanze"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Imposta automaticamente la data e l\'ora utilizzando la posizione del dispositivo, se disponibile. Potrebbe essere necessaria anche una connessione Wi-Fi attiva."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Usa impostazioni internazionali predefinite"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Usa il formato 24 ore"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Ora"</string>
@@ -659,12 +660,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Imposta sequenza per lo spazio privato"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Blocca"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Nascondi"</string>
-    <!-- no translation found for private_space_confirm_your_pattern_header (449382220134788771) -->
-    <skip />
-    <!-- no translation found for private_space_confirm_your_pin_header (4543332157470087796) -->
-    <skip />
-    <!-- no translation found for private_space_confirm_your_password_header (9202308075814307169) -->
-    <skip />
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Conferma la sequenza dello spazio privato"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Inserisci di nuovo il PIN dello spazio privato"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Inserisci di nuovo la password dello spazio privato"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Puoi aggiungere fino a <xliff:g id="COUNT">%d</xliff:g> impronte digitali"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Hai aggiunto il numero massimo di impronte digitali"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Impossibile aggiungere ulteriori impronte digitali"</string>
@@ -1032,10 +1030,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Controlla la password e riprova"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Contatta il produttore del dispositivo"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Controlla la connessione e riprova"</string>
-    <!-- no translation found for wifi_dpp_check_connection_no_matched_ssid (3608318690698685427) -->
-    <skip />
-    <!-- no translation found for wifi_dpp_check_connection_no_matched_security (1462706753123341376) -->
-    <skip />
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Al momento, questa rete Wi-Fi non è disponibile"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Si è verificato un problema con questo codice QR. Prova a connetterti in un altro modo."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Scegli rete"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Per connettere il tuo dispositivo, scegli una rete"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Aggiungere questo dispositivo alla rete \"<xliff:g id="SSID">%1$s</xliff:g>\"?"</string>
@@ -1330,7 +1326,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"Non disponibili perché la modalità Riposo è attiva"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"Usa il salvaschermo"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"Durante la ricarica o quando inserito nel dock"</string>
-    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"Inserito nel dock e in carica"</string>
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"Agganciato alla base e in carica"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"Durante la ricarica"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"Quando inserito nel dock"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"Mai"</string>
@@ -1951,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Accessibilità"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Tastiera fisica"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Tasti rimbalzati"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"La tastiera ignora le pressioni ripetute velocemente dello stesso tasto"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Soglia antirimbalzo dei tasti"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Scegli la durata di tempo in cui la tastiera ignora le pressioni ripetute dei tasti"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2 s"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4 s"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0,6 s"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Tasti lenti"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Regola il tempo di risposta per la pressione di un tasto"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Tasti permanenti"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Premi un tasto alla volta per le scorciatoie invece di tenere premuti più tasti contemporaneamente"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Tasti del mouse"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Usa la tastiera per controllare il puntatore"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Scorrimento invertito del mouse"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Scorri verso l\'alto per spostare la pagina in basso"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Scambia i tasti sinistro e destro"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Usa il tasto sinistro del mouse come il destro"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Scorciatoie da tastiera"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Mostra l\'elenco di scorciatoie"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Tastiere e strumenti del profilo di lavoro"</string>
@@ -2039,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Scegli un nuovo tasto per <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Accessibilità della tastiera fisica"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Tasti permanenti, tasti rimbalzati, tasti del mouse"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Layout <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Predefinito"</string>
@@ -2447,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Anteprima"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Opzioni standard"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Lingua"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Dimensioni sottotitoli codificati"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Stile sottotitoli"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Opzioni personalizzate"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Colore sfondo"</string>
@@ -2992,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Disconnettere questa VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Disconnetti"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versione"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Rimuovi VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Sostituire la rete VPN esistente?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Impostare la rete VPN sempre attiva?"</string>
@@ -3924,8 +3921,7 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Crea una modalità"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Modalità personalizzata"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Nome della modalità"</string>
-    <!-- no translation found for zen_mode_edit_name_empty_error (5788063278827188275) -->
-    <skip />
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Il nome della modalità non può essere vuoto"</string>
     <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Scegli un\'icona"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Eventi nel calendario"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Routine Buonanotte"</string>
@@ -5158,7 +5154,7 @@
     <string name="multiple_users_title_keywords" msgid="2395593167746225172">"più, utenti, profili, persone, account, sensore, molti"</string>
     <string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Usa debug wireless"</string>
     <string name="graphics_driver_main_switch_title" msgid="6125172901855813790">"Usa Preferenze del driver di grafica"</string>
-    <string name="night_light_main_switch_title" msgid="3428298022467805219">"Usa Luminosità notturna"</string>
+    <string name="night_light_main_switch_title" msgid="3428298022467805219">"Usa luminosità notturna"</string>
     <string name="nfc_main_switch_title" msgid="6295839988954817432">"Usa NFC"</string>
     <string name="adaptive_brightness_main_switch_title" msgid="2681666805191642737">"Usa la luminosità adattiva"</string>
     <string name="wifi_calling_main_switch_title" msgid="4070224008346815634">"Usa Chiamate Wi-Fi"</string>
@@ -5468,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Cerca in Impostazioni"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"contatti, spazio di archiviazione, account"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Archiviazione contatti"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Solo dispositivo"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"I nuovi contatti non verranno sincronizzati con un account"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"I contatti verranno salvati sul dispositivo e sincronizzati con il tuo account per impostazione predefinita"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Nessun account predefinito"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Aggiungi un account per iniziare"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index 6d19195..e7680ed 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"תיק נשיאה"</item>
-    <item msgid="184985872234062767">"בניין קלאסי"</item>
-    <item msgid="9189550412466785530">"בניין מגורים"</item>
-    <item msgid="2142527562511049422">"בועת דיבור"</item>
-    <item msgid="2548100558260478605">"קבוצה של אנשים"</item>
-    <item msgid="2270003903304578284">"נורה"</item>
-    <item msgid="4793496619091161864">"יומן"</item>
-    <item msgid="5673625795644364100">"נא לא להפריע"</item>
-    <item msgid="1423820834865831361">"אדם רץ"</item>
-    <item msgid="2037298830718732608">"גולף"</item>
-    <item msgid="2197835014443491074">"משקולת יד דאמבל"</item>
-    <item msgid="2730180105015616518">"שחייה"</item>
-    <item msgid="2666922823253345958">"אדם בטיול רגלי"</item>
-    <item msgid="8234880356472211396">"אדם זורק כדור"</item>
-    <item msgid="4642980625253001443">"אדם בועט"</item>
-    <item msgid="4324795269518833500">"בקר משחקים"</item>
-    <item msgid="7789966425125441125">"לוח צבעים של אומן"</item>
-    <item msgid="663512680597461570">"פתית שלג"</item>
-    <item msgid="7952183800501346803">"שמשייה"</item>
-    <item msgid="799139025758265891">"כלי עבודה"</item>
-    <item msgid="1330084588359129896">"אוהל"</item>
-    <item msgid="3861584909935022342">"סרט צילום (פילם)"</item>
-    <item msgid="5827426100157335512">"ספר"</item>
-    <item msgid="8585828346253128384">"פרח לוטוס"</item>
-    <item msgid="8788370542815300188">"תודעה של אדם"</item>
-    <item msgid="7287354964767553293">"אוזניות"</item>
-    <item msgid="2530059623783800987">"טלוויזיה"</item>
-    <item msgid="5307182323469376758">"רכבת"</item>
-    <item msgid="4903790544026923026">"רכב"</item>
-    <item msgid="5010405583912314582">"סכין ומזלג"</item>
-    <item msgid="8939998598599064900">"עגלת קניות"</item>
-    <item msgid="3379605903308731893">"ילד/ה"</item>
-    <item msgid="7808668968550293112">"כפות של בעל חיים"</item>
-    <item msgid="1000692647524056504">"תג כוכב"</item>
-    <item msgid="8270261073421676502">"שני אנשים"</item>
-    <item msgid="5767782819651505460">"כוכב"</item>
-    <item msgid="4368451291862729334">"לב"</item>
-    <item msgid="2613199102208419986">"בית"</item>
-    <item msgid="3022279986430275040">"חצי ירח"</item>
-    <item msgid="5421089790869483206">"שעון"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 0595601..13a53af 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"הגדרה אוטומטית באמצעות הרשת והאותות האלחוטיים"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"אזור זמן אוטומטי"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"הגדרה אוטומטית בהתאם לרשתות הסלולריות בקרבתך"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"‏הגדרה אוטומטית באמצעות מיקום המכשיר, אם האפשרות זמינה. יכול להיות שצריך גם חיבור Wi-Fi פעיל."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"לפי ברירת המחדל באזור"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"פורמט 24 שעות"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"שעה"</string>
@@ -1804,7 +1805,7 @@
     <string name="application_size_label" msgid="6407051020651716729">"גודל האפליקציה"</string>
     <string name="external_code_size_label" msgid="7375146402660973743">"‏אפליקציה של אחסון USB"</string>
     <string name="data_size_label" msgid="7814478940141255234">"נתוני משתמש"</string>
-    <string name="uninstall_text" msgid="315764653029060126">"הסרת התקנה"</string>
+    <string name="uninstall_text" msgid="315764653029060126">"הסרה"</string>
     <string name="uninstall_all_users_text" msgid="5924715251087176474">"להסרת התקנה עבור כל המשתמשים"</string>
     <string name="install_text" msgid="4558333621516996473">"התקנה"</string>
     <string name="disable_text" msgid="5146002260857428005">"השבתה"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"נגישות"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"מקלדת פיזית"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"מקשים חוזרים"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"המערכת מתעלמת מהקשות מהירות חוזרות על אותו המקש במקלדת"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"הסף לסינון הקשות חוזרות"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"צריך לבחור את משך הזמן שבו המערכת מתעלמת מהקשות חוזרות על מקשים במקלדת"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0.2 שניות"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0.4 שניות"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0.6 שניות"</string>
     <string name="slow_keys" msgid="2891452895499690837">"מקשים איטיים"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"שינוי הזמן שעובר מהקשה על מקש ועד להפעלה שלו"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"מקשים \"דביקים\""</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"מקישים אחד-אחד על רצף של מקשי קיצור, ולא צריך ללחוץ עליהם בו-זמנית."</string>
     <string name="mouse_keys" msgid="6237254627808525540">"מקשי העכבר"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"שליטה בסמן באמצעות המקלדת"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"גלילה הפוכה עם העכבר"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"גלילה למעלה להזזת הדף למטה"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"החלפה בין הלחצן השמאלי ללחצן הימני"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"שימוש בלחצן השמאלי של העכבר כלחצן הימני"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"מקשי קיצור"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"הצגת רשימה של מקשי הקיצור"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"מקלדות וכלים בפרופיל העבודה"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"יש לבחור מפתח חדש עבור <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"תכונות נגישות שפועלות באמצעות מקלדת פיזית"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"מקשים \"דביקים\", מקשים חוזרים, לחצני העכבר"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"פריסה של <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ברירת מחדל"</string>
@@ -2288,7 +2289,7 @@
     <string name="accessibility_force_invert_title" msgid="5015366813138748407">"הגדרת עיצוב כהה לכל האפליקציות"</string>
     <string name="accessibility_force_invert_summary" msgid="1882329675950887268">"רלוונטי לאפליקציות ללא עיצוב כהה משלהן. בחלק מהאפליקציות עשויות להיות בעיות תצוגה, כמו היפוך צבעים."</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"הסרת אנימציות"</string>
-    <string name="accessibility_disable_animations_summary" msgid="5828228669556554565">"הפחתת התנועה במסך"</string>
+    <string name="accessibility_disable_animations_summary" msgid="5828228669556554565">"יהיו פחות תנועות במסך"</string>
     <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"אודיו במונו"</string>
     <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"שילוב ערוצים כאשר מפעילים אודיו"</string>
     <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"איזון אודיו"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"תצוגה מקדימה"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"אפשרויות רגילות"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"שפה"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"גודל כתובית"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"סגנון כתוביות"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"אפשרויות מותאמות אישית"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"צבע הרקע"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"‏האם לנתק את ה-VPN הזה?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"ניתוק"</string>
     <string name="vpn_version" msgid="6344167191984400976">"גרסה"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"‏אני רוצה לשכוח את ה-VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"‏האם להחליף רשת VPN קיימת?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"‏האם להגדיר את רשת ה-VPN בחיבור תמידי?"</string>
@@ -3710,7 +3712,7 @@
     <string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"הגדרות נוספות זמינות בתוך האפליקציה הזו"</string>
     <string name="notification_polite_title" msgid="6121016426991791557">"הפוגת התראות"</string>
     <string name="notification_polite_main_control_title" msgid="5812529809151927149">"שימוש בהפוגת התראות"</string>
-    <string name="notification_polite_description" msgid="5497748284893832854">"כשמתקבלות הרבה התראות בפרק זמן קצר, המכשיר ינמיך את עוצמת הקול ויצמצם את כמות ההתראות למשך עד שתי דקות. שיחות, התרעות ושיחות בעדיפות גבוהה לא מושפעות. \n\nניתן למצוא התראות שהתקבלו במהלך ההפוגה על ידי משיכה למטה מהחלק העליון של המסך."</string>
+    <string name="notification_polite_description" msgid="5497748284893832854">"אם קיבלת הרבה התראות תוך זמן קצר, המכשיר ינמיך את עוצמת הקול ויצמצם את ההפרעות למשך עד 2 דקות. ההפוגה לא חלה על שיחות, שעונים מעוררים ושיחות בעדיפות גבוהה. \n\nכדי למצוא את ההתראות שהתקבלו במהלך ההפוגה, מושכים למטה מראש המסך."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"הפעלה בפרופילי העבודה"</string>
     <string name="notification_polite_work_summary" msgid="5014189280132951378">"הפעלה באפליקציות של פרופיל העבודה"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"‏שירותי סיוע של VR"</string>
@@ -3837,7 +3839,7 @@
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"הודעות"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"הודעות"</string>
     <string name="zen_mode_messages_header" msgid="253721635061451577">"הודעות שיכולות להפריע"</string>
-    <string name="zen_mode_messages_footer" msgid="6002468050854126331">"כדי שבטוח יישמע צליל התראה כשייכנסו הודעות מורשות, צריך לוודא שהמכשיר נמצא במצב \'צלצול\'"</string>
+    <string name="zen_mode_messages_footer" msgid="6002468050854126331">"כדי שהמכשיר ישמיע צליל התראה כשמגיעות הודעות מורשות, צריך להעביר אותו למצב \'צלצול\'"</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"במצב \'<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\', הודעות נכנסות ייחסמו. ניתן לשנות את ההגדרות כדי לאפשר לחברים, לבני משפחה או לאנשי קשר אחרים ליצור איתך קשר."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"כל ההודעות יכולות להגיע אליך"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"כל השיחות יכולות להגיע אליך"</string>
@@ -3940,7 +3942,7 @@
     <string name="zen_mode_blurb_immersive" msgid="5884004861848687869">"חוסמים הסחות דעת והפרעות במכשיר ומתרכזים טוב יותר"</string>
     <string name="zen_mode_blurb_theater" msgid="2999237960059524225">"מסירים את כל הסחות דעת ונהנים מסביבה שקטה"</string>
     <string name="zen_mode_blurb_managed" msgid="5473921634985032149">"התאמה אישית של חווית המשתמש ושל ההגדרות במכשיר למשתמשים שונים"</string>
-    <string name="zen_mode_blurb_generic" msgid="3041601339807075625">"מצמצמים הפרעות: אפשר לקבל התראות רק מאפליקציות מסוימות ומאנשים חשובים"</string>
+    <string name="zen_mode_blurb_generic" msgid="3041601339807075625">"פחות הסחות דעת: יתקבלו התראות רק מאפליקציות נבחרות ומאנשים חשובים"</string>
     <string name="zen_mode_inspiration_schedule_time" msgid="5596540503159096153">"הגדרת מצב עם לוח זמנים קבוע"</string>
     <string name="zen_mode_inspiration_schedule_calendar" msgid="3678727180860212700">"שמירה על סנכרון המכשיר עם האירועים של היום"</string>
     <string name="zen_mode_inspiration_bedtime" msgid="6294822414181670666">"מתעוררים עם תחושה שהכול מושלם"</string>
@@ -5369,7 +5371,7 @@
     <string name="audio_sharing_stream_name_title" msgid="8156859441897180940">"שם"</string>
     <string name="audio_sharing_stream_password_title" msgid="7026649168165764602">"סיסמה"</string>
     <string name="audio_sharing_stream_compatibility_title" msgid="5690947186724469918">"שיפור התאימות"</string>
-    <string name="audio_sharing_stream_compatibility_description" msgid="8170241188606110963">"ההגדרה הזו עוזרת למכשירים מסוימים, כמו מכשירי שמיעה, להתחבר על ידי הפחתת איכות האודיו"</string>
+    <string name="audio_sharing_stream_compatibility_description" msgid="8170241188606110963">"ההגדרה הזו מורידה את איכות האודיו כדי שמכשירים כמו מכשירי שמיעה יוכלו להתחבר"</string>
     <string name="audio_sharing_stream_compatibility_disabled_description" msgid="2586408353546825682">"ההגדרה הזו משביתה את שיתוף האודיו כדי להגדיר את התאימות"</string>
     <string name="audio_sharing_nearby_audio_title" msgid="4795438407040677177">"האזנה לאודיו בקרבת מקום"</string>
     <string name="audio_sharing_footer_description" msgid="4786942197840271680">"‏התכונה \'שיתוף אודיו\' תומכת ב-‎Auracast™‎"</string>
@@ -5463,13 +5465,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"חיפוש בהגדרות"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"אנשי קשר, אחסון, חשבון"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"אחסון אנשי הקשר"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"מכשיר בלבד"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"אנשי קשר חדשים לא יסונכרנו עם חשבון כלשהו"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"אנשי הקשר יישמרו במכשיר ויוסנכרנו עם החשבון שלך כברירת מחדל"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"לא הוגדרה ברירת מחדל"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"כדי להתחיל, צריך להוסיף חשבון"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index e5ac9e5..4540b99 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"書類カバン"</item>
-    <item msgid="184985872234062767">"古典的な建物"</item>
-    <item msgid="9189550412466785530">"アパート"</item>
-    <item msgid="2142527562511049422">"吹き出し"</item>
-    <item msgid="2548100558260478605">"人々のグループ写真"</item>
-    <item msgid="2270003903304578284">"電球"</item>
-    <item msgid="4793496619091161864">"カレンダー"</item>
-    <item msgid="5673625795644364100">"サイレント モード"</item>
-    <item msgid="1423820834865831361">"ランニングしている人"</item>
-    <item msgid="2037298830718732608">"ゴルフ"</item>
-    <item msgid="2197835014443491074">"ジムのダンベル"</item>
-    <item msgid="2730180105015616518">"水泳"</item>
-    <item msgid="2666922823253345958">"ハイキングをしている人"</item>
-    <item msgid="8234880356472211396">"ボールを投げている人"</item>
-    <item msgid="4642980625253001443">"蹴っている人"</item>
-    <item msgid="4324795269518833500">"ゲーム コントローラ"</item>
-    <item msgid="7789966425125441125">"アーティストのカラーパレット"</item>
-    <item msgid="663512680597461570">"雪の結晶"</item>
-    <item msgid="7952183800501346803">"ビーチパラソル"</item>
-    <item msgid="799139025758265891">"工具セット"</item>
-    <item msgid="1330084588359129896">"テント"</item>
-    <item msgid="3861584909935022342">"フィルムリール"</item>
-    <item msgid="5827426100157335512">"書籍"</item>
-    <item msgid="8585828346253128384">"ハスの花"</item>
-    <item msgid="8788370542815300188">"人の心"</item>
-    <item msgid="7287354964767553293">"ヘッドフォン"</item>
-    <item msgid="2530059623783800987">"テレビ"</item>
-    <item msgid="5307182323469376758">"電車"</item>
-    <item msgid="4903790544026923026">"車"</item>
-    <item msgid="5010405583912314582">"ナイフとフォーク"</item>
-    <item msgid="8939998598599064900">"ショッピング カート"</item>
-    <item msgid="3379605903308731893">"子ども"</item>
-    <item msgid="7808668968550293112">"動物の足"</item>
-    <item msgid="1000692647524056504">"スターバッジ"</item>
-    <item msgid="8270261073421676502">"2 人"</item>
-    <item msgid="5767782819651505460">"スター"</item>
-    <item msgid="4368451291862729334">"ハート"</item>
-    <item msgid="2613199102208419986">"家"</item>
-    <item msgid="3022279986430275040">"半月"</item>
-    <item msgid="5421089790869483206">"時計"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 213c202..dde62a7 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"ネットワークとワイヤレス通信を使用して自動的に設定します"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"タイムゾーンの自動設定"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"付近のモバイル ネットワークに基づいて自動的に設定します"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"可能であればデバイスの位置情報で自動設定します。アクティブな Wi-Fi 接続が必要になることもあります。"</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"言語 / 地域で一般的な形式を使用する"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24時間表示"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"時刻"</string>
@@ -1958,6 +1959,14 @@
     <string name="sticky_keys_summary" msgid="1844953803625480623">"ショートカットで複数のキーを同時に押すのではなく 1 つずつ押します"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"マウスキー"</string>
     <string name="mouse_keys_summary" msgid="7030731235143286467">"キーボードを使用してポインタを操作します"</string>
+    <!-- no translation found for mouse_reverse_vertical_scrolling (154907817154779952) -->
+    <skip />
+    <!-- no translation found for mouse_reverse_vertical_scrolling_summary (3386655598642587942) -->
+    <skip />
+    <!-- no translation found for mouse_swap_primary_button (3028204969091057207) -->
+    <skip />
+    <!-- no translation found for mouse_swap_primary_button_summary (3276638019321067902) -->
+    <skip />
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"キーボード ショートカット"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"ショートカットのリストを表示"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"仕事用プロファイルのキーボードとツール"</string>
@@ -2026,9 +2035,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> の新しいキーを選択してください"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"物理キーボードのユーザー補助"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"固定キー、バウンスキー、マウスキー"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"レイアウト: <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"デフォルト"</string>
@@ -2979,6 +2992,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"この VPN の接続を解除しますか?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"接続を解除"</string>
     <string name="vpn_version" msgid="6344167191984400976">"バージョン"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN を削除"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"既存の VPN を置き換えますか?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"常時接続 VPN を設定しますか?"</string>
@@ -5451,7 +5466,7 @@
     <string name="audio_streams_main_page_password_dialog_cannot_edit" msgid="9020898619297520153">"共有中はパスワードを編集できません。パスワードを変更するには、まず音声の共有を OFF にしてください。"</string>
     <string name="audio_streams_qr_code_scanner_label" msgid="8799703301071378034">"QR コードスキャナ"</string>
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"ご不明な点がある場合"</annotation></string>
-    <string name="homepage_search" msgid="6759334912284663559">"検索設定"</string>
+    <string name="homepage_search" msgid="6759334912284663559">"設定を検索"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"連絡先, ストレージ, アカウント"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"連絡先アプリのストレージ"</string>
     <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"デバイスのみ"</string>
@@ -5459,4 +5474,8 @@
     <string name="contacts_storage_selection_message" msgid="8082077300632059003">"デフォルトでは、連絡先はデバイスに保存されて、アカウントと同期されます"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"デフォルトは設定されていません"</string>
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"開始するにはアカウントを追加してください"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
+    <skip />
 </resources>
diff --git a/res/values-ka/arrays.xml b/res/values-ka/arrays.xml
index cd428c1..c2385f2 100644
--- a/res/values-ka/arrays.xml
+++ b/res/values-ka/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"ქეისი"</item>
-    <item msgid="184985872234062767">"კლასიკური შენობა"</item>
-    <item msgid="9189550412466785530">"აპარტამენტების შენობა"</item>
-    <item msgid="2142527562511049422">"საუბრის ბუშტი"</item>
-    <item msgid="2548100558260478605">"ადამიანების ჯგუფი"</item>
-    <item msgid="2270003903304578284">"ნათურა"</item>
-    <item msgid="4793496619091161864">"კალენდარი"</item>
-    <item msgid="5673625795644364100">"არ შემაწუხოთ"</item>
-    <item msgid="1423820834865831361">"მორბენალი ადამიანი"</item>
-    <item msgid="2037298830718732608">"გოლფი"</item>
-    <item msgid="2197835014443491074">"სპორტული დარბაზის ჰანტელი"</item>
-    <item msgid="2730180105015616518">"ცურვა"</item>
-    <item msgid="2666922823253345958">"მოლაშქრე"</item>
-    <item msgid="8234880356472211396">"ადამიანი, რომელიც ბურთს ისვრის"</item>
-    <item msgid="4642980625253001443">"ადამიანი, რომელიც არტყამს"</item>
-    <item msgid="4324795269518833500">"თამაშის კონტროლერი"</item>
-    <item msgid="7789966425125441125">"მხატვრის ფერთა პალიტრა"</item>
-    <item msgid="663512680597461570">"ფიფქი"</item>
-    <item msgid="7952183800501346803">"სანაპიროს ქოლგა"</item>
-    <item msgid="799139025758265891">"სახელოსნოს ხელსაწყოები"</item>
-    <item msgid="1330084588359129896">"კარავი"</item>
-    <item msgid="3861584909935022342">"კინოკადრი"</item>
-    <item msgid="5827426100157335512">"დაჯავშნა"</item>
-    <item msgid="8585828346253128384">"ლოტოსის ყვავილი"</item>
-    <item msgid="8788370542815300188">"ადამიანის გონება"</item>
-    <item msgid="7287354964767553293">"ყურსასმენები"</item>
-    <item msgid="2530059623783800987">"ტელევიზორი"</item>
-    <item msgid="5307182323469376758">"მატარებელი"</item>
-    <item msgid="4903790544026923026">"მანქანა"</item>
-    <item msgid="5010405583912314582">"დანა-ჩანგალი"</item>
-    <item msgid="8939998598599064900">"საყიდლების კალათა"</item>
-    <item msgid="3379605903308731893">"ბავშვი"</item>
-    <item msgid="7808668968550293112">"ცხოველის თათი"</item>
-    <item msgid="1000692647524056504">"ვარსკვლავის ბეჯი"</item>
-    <item msgid="8270261073421676502">"ორი ადამიანი"</item>
-    <item msgid="5767782819651505460">"ვარსკვლავი"</item>
-    <item msgid="4368451291862729334">"გული"</item>
-    <item msgid="2613199102208419986">"სახლი"</item>
-    <item msgid="3022279986430275040">"ნახევარმთვარე"</item>
-    <item msgid="5421089790869483206">"საათი"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 6f64a8b..f58d5c6 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"ავტომატურად დაყენება თქვენი ქსელის და უსადენო სიგნალების გამოყენებით"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"ავტომატური სასაათო სარტყელი"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"ავტომატურად დაყენება თქვენთან ახლომდებარე მობილურ ქსელებზე დაყრდნობით"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"ავტომატურად დაყენება მოწყობილობის მდებარეობით, თუ ხელმისაწვდომია. შეიძლება მოითხოვოს აქტიური Wi-Fi."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"ლოკალის ნაგულისხმევი პარამეტრის გამოყენება"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-საათიანი ფორმატი"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"დრო"</string>
@@ -1958,6 +1959,10 @@
     <string name="sticky_keys_summary" msgid="1844953803625480623">"მალსახმობებისთვის დააჭირეთ კლავიშებს ცალ-ცალკე და არა ერთდროულად"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"მაუსის კლავიშები"</string>
     <string name="mouse_keys_summary" msgid="7030731235143286467">"თქვენი კლავიატურის გამოყენება კურსორის სამართავად"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"მაუსით უკუგადაადგილება"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"ზემოთ გადაადგილება გვერდის ჩამოსაწევად"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"მარცხენა და მარჯვენა ღილაკების ფუნქციის გაცვლა"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"გამოიყენეთ მაუსის მარცხენა ღილაკი მარჯვენის ფუნქციით"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"კლავიატურის მალსახმობები"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"მალსახმობების სიის ჩვენება"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"სამსახურის პროფილის კლავიატურა და ხელსაწყოები"</string>
@@ -2026,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"აირჩიეთ ახალი კლავიში <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>-ისთვის:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"ფიზიკური კლავიატურის მისაწვდომობა"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"კლავიშების ფიქსაცია, მრავალჯერადი დაჭერის შეზღუდვა კლავიშებზე, მაუსის კლავიშები"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> განლაგება"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ნაგულისხმევი"</string>
@@ -2434,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"წინასწარ ნახვა"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"სტანდარტული პარამეტრები"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"ენა"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"სუბტიტრების ზომა"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"ტიტრის სტილი"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"მორგებული პარამეტრები"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"ფონის ფერი"</string>
@@ -2979,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"გსურთ ამ VPN-თან კავშირის გაწყვეტა?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"კავშირის გაწყვეტა"</string>
     <string name="vpn_version" msgid="6344167191984400976">"ვერსია"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN-ის დავიწყება"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"გსურთ არსებული VPN-ის ჩანაცვლება?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"გსურთ ყოველთვის ჩართული VPN-ის დაყენება?"</string>
@@ -5459,4 +5469,8 @@
     <string name="contacts_storage_selection_message" msgid="8082077300632059003">"კონტაქტები შეინახება თქვენს მოწყობილობაში და სინქრონიზდება თქვენს ანგარიშთან ნაგულისხმევად"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"ნაგულისხმევი ანგარიში დაყენებული არ არის"</string>
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"დასაწყებად დაამატეთ ანგარიში"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
+    <skip />
 </resources>
diff --git a/res/values-kk/arrays.xml b/res/values-kk/arrays.xml
index 4e7f4d0..cbc026e 100644
--- a/res/values-kk/arrays.xml
+++ b/res/values-kk/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Портфель"</item>
-    <item msgid="184985872234062767">"Классикалық ғимарат"</item>
-    <item msgid="9189550412466785530">"Тұрғын үй ғимараты"</item>
-    <item msgid="2142527562511049422">"Мәтінді бұлтшалар"</item>
-    <item msgid="2548100558260478605">"Адамдар тобы"</item>
-    <item msgid="2270003903304578284">"Шам"</item>
-    <item msgid="4793496619091161864">"Күнтізбе"</item>
-    <item msgid="5673625795644364100">"Мазаламау"</item>
-    <item msgid="1423820834865831361">"Жүгіріп бара жатқан адам"</item>
-    <item msgid="2037298830718732608">"Гольф"</item>
-    <item msgid="2197835014443491074">"Спортзалдағы гантель"</item>
-    <item msgid="2730180105015616518">"Жүзу"</item>
-    <item msgid="2666922823253345958">"Жаяу жүріп бара жатқан адам"</item>
-    <item msgid="8234880356472211396">"Доп лақтырып жатқан адам"</item>
-    <item msgid="4642980625253001443">"Теуіп жатқан адам"</item>
-    <item msgid="4324795269518833500">"Ойын контроллері"</item>
-    <item msgid="7789966425125441125">"Суретшінің түстер палитрасы"</item>
-    <item msgid="663512680597461570">"Ұлпа қар"</item>
-    <item msgid="7952183800501346803">"Жағажай қолшатыры"</item>
-    <item msgid="799139025758265891">"Шеберхана құралдары"</item>
-    <item msgid="1330084588359129896">"Шатыр"</item>
-    <item msgid="3861584909935022342">"Кинопленка"</item>
-    <item msgid="5827426100157335512">"Кітап"</item>
-    <item msgid="8585828346253128384">"Лотос гүлі"</item>
-    <item msgid="8788370542815300188">"Адам санасы"</item>
-    <item msgid="7287354964767553293">"Құлақаспап"</item>
-    <item msgid="2530059623783800987">"Теледидар"</item>
-    <item msgid="5307182323469376758">"Пойыз"</item>
-    <item msgid="4903790544026923026">"Автокөлік"</item>
-    <item msgid="5010405583912314582">"Шанышқы мен пышақ"</item>
-    <item msgid="8939998598599064900">"Себет"</item>
-    <item msgid="3379605903308731893">"Бала"</item>
-    <item msgid="7808668968550293112">"Жануардың табаны"</item>
-    <item msgid="1000692647524056504">"Жұлдызша танымбелгісі"</item>
-    <item msgid="8270261073421676502">"Екі адам"</item>
-    <item msgid="5767782819651505460">"Жұлдыз"</item>
-    <item msgid="4368451291862729334">"Жүрек"</item>
-    <item msgid="2613199102208419986">"Үй"</item>
-    <item msgid="3022279986430275040">"Жарты ай"</item>
-    <item msgid="5421089790869483206">"Сағат"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index db84d7c..c573428 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Желі мен сымсыз сигналдар арқылы автоматты түрде орнатылады."</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Aвтоматты уақыт белдеуі"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Маңайдағы мобильдік желілер негізінде автоматты түрде орнату"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Құрылғы локациясы (қолжетімді болса) арқылы автоматты түрде орнатылады. Қосулы Wi-Fi байланысы да қажет болуы мүмкін."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Жергілікті әдепкі формат"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24 сағаттық формат"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Уақыт"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Арнайы мүмкіндіктер"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Физикалық пернетақта"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Қайтару пернелері"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Пернетақта бір перненің тез арада қайталап басылуын елемейді."</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Пернелердің байқаусызда басылуын елемеу шегі"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Пернетақта пернелердің қайталап басылуын елемейтін уақыт ұзақтығын таңдаңыз."</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2 с"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4 с"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0,6 с"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Баяу пернелер"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Басқаннан кейін перненің іске қосылу уақытын реттейді."</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Бекітілген пернелер"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Жылдам пәрмендерді пайдалану үшін пернелерді бірге баспай-ақ, бір пернені бір рет бассаңыз болады."</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Тінтуір пернелері"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Меңзерді басқару үшін пернетақтаны пайдаланыңыз."</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Тінтуірмен кері айналдыру"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Бетті төмен жылжыту үшін жоғары қарай айналдырыңыз."</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Сол және оң жақ түймелердің орындарын ауыстырыңыз"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Тінтуірдің сол жақ түймесін оң жақ түйме ретінде пайдаланыңыз."</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Перне тіркесімдері"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Перне тіркесімдерінің тізімін көрсету"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Жұмыс профилі пернетақталары және құралдары"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> жаңа пернесін таңдау:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Физикалық пернетақтаның арнайы мүмкіндіктері"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Бекітілген пернелер, серпімді пернелер, тінтуір пернелері"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> форматы"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Әдепкі"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Алғы көрініс"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Стандартты опциялар"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Тіл"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Жазу өлшемі"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Субтитр стилі"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Реттеу опциялары"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Артқы фон түсі"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Осы VPN желісі ажыратылсын ба?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Ажырату"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Нұсқа"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN ұмыту"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Бар VPN қолданбасын ауыстыру керек пе?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Әрқашан қосулы VPN режимін орнату"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Іздеу параметрлері"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"контактілер, жад, аккаунт"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Контактілер жады"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Тек құрылғы"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Жаңа контактілер аккаунтпен синхрондалмайды."</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Контактілер әдепкісінше аккаунтыңызбен синхрондалады және құрылғыңызға сақталады."</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Әдепкі аккаунт таңдалмаған"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Бастау үшін аккаунт қосыңыз."</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-km/arrays.xml b/res/values-km/arrays.xml
index 5d97701..122ba62 100644
--- a/res/values-km/arrays.xml
+++ b/res/values-km/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"កាបូបធ្វើការ"</item>
-    <item msgid="184985872234062767">"អគារបុរាណ"</item>
-    <item msgid="9189550412466785530">"អគារអាផាតមិន"</item>
-    <item msgid="2142527562511049422">"ផ្ទាំងវាចា"</item>
-    <item msgid="2548100558260478605">"ក្រុមមនុស្ស"</item>
-    <item msgid="2270003903304578284">"អំពូលភ្លើង"</item>
-    <item msgid="4793496619091161864">"ប្រតិទិន"</item>
-    <item msgid="5673625795644364100">"កុំ​រំខាន"</item>
-    <item msgid="1423820834865831361">"មនុស្សរត់"</item>
-    <item msgid="2037298830718732608">"កូនហ្គោល"</item>
-    <item msgid="2197835014443491074">"ដុំដែកនៅកន្លែងហាត់ប្រាណ"</item>
-    <item msgid="2730180105015616518">"ការហែលទឹក"</item>
-    <item msgid="2666922823253345958">"មនុស្សកំពុងដើរកាត់​ព្រៃភ្នំ"</item>
-    <item msgid="8234880356472211396">"មនុស្សកំពុងគប់បាល់"</item>
-    <item msgid="4642980625253001443">"មនុស្សកំពុងធាក់"</item>
-    <item msgid="4324795269518833500">"ឧបករណ៍បញ្ជាហ្គេម"</item>
-    <item msgid="7789966425125441125">"ក្ដារ​លាយ​ពណ៌វិចិត្រករ"</item>
-    <item msgid="663512680597461570">"ផ្កាព្រិល"</item>
-    <item msgid="7952183800501346803">"ឆត្រនៅតាមឆ្នេរ"</item>
-    <item msgid="799139025758265891">"ឧបករណ៍រោងជាង"</item>
-    <item msgid="1330084588359129896">"តង់"</item>
-    <item msgid="3861584909935022342">"ដុំហ្វីលភាពយន្ត"</item>
-    <item msgid="5827426100157335512">"សៀវភៅ"</item>
-    <item msgid="8585828346253128384">"ផ្កា​ឈូក"</item>
-    <item msgid="8788370542815300188">"ចិត្តរបស់មនុស្ស"</item>
-    <item msgid="7287354964767553293">"កាស"</item>
-    <item msgid="2530059623783800987">"ទូរទស្សន៍"</item>
-    <item msgid="5307182323469376758">"រថភ្លើង"</item>
-    <item msgid="4903790544026923026">"រថយន្ត"</item>
-    <item msgid="5010405583912314582">"សម ​និង​កាំបិត"</item>
-    <item msgid="8939998598599064900">"រទេះទិញទំនិញ"</item>
-    <item msgid="3379605903308731893">"កុមារ"</item>
-    <item msgid="7808668968550293112">"ក្រញាំសត្វ"</item>
-    <item msgid="1000692647524056504">"សញ្ញាផ្កាយ"</item>
-    <item msgid="8270261073421676502">"មនុស្សពីរនាក់"</item>
-    <item msgid="5767782819651505460">"ផ្កាយ"</item>
-    <item msgid="4368451291862729334">"បេះដូង"</item>
-    <item msgid="2613199102208419986">"ផ្ទះ"</item>
-    <item msgid="3022279986430275040">"ព្រះ​ចន្ទមួយចំហៀង"</item>
-    <item msgid="5421089790869483206">"នាឡិកា"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index b49f011..b8270cd 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"កំណត់​ដោយស្វ័យប្រវត្តិ​ដោយប្រើ​បណ្ដាញ និង​សញ្ញា​ឥតខ្សែ​របស់អ្នក"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"ល្វែង​ម៉ោង​ស្វ័យ​ប្រវត្តិ"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"កំណត់​ដោយ​ស្វ័យប្រវត្តិ​ដោយ​ផ្អែកលើ​បណ្ដាញ​ទូរសព្ទ​ចល័ត​ដែលនៅជិតអ្នក"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"កំណត់ដោយស្វ័យប្រវត្តិដោយប្រើទីតាំងឧបករណ៍អ្នក ប្រសិនបើមាន។ ក៏អាចតម្រូវឱ្យមានការតភ្ជាប់ Wifi ដែលកំពុងដំណើរការផងដែរ។"</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"ប្រើ​តាមតំបន់"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"ប្រើ​ប្រព័ន្ធ ២៤ ម៉ោង"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"ម៉ោង"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"ភាពងាយស្រួល"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"ក្ដារចុច​រូបវ័ន្ត"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"គ្រាប់ចុចឡង"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"ក្ដារចុចមិនអើពើនឹងការចុចដដែលៗយ៉ាងរហ័សនៃគ្រាប់ចុចដដែល"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"កម្រិតកំណត់គ្រាប់ចុចឡង"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"ជ្រើសរើសរយៈពេលដែលក្តារចុចរបស់អ្នកមិនអើពើនឹងការចុចគ្រាប់ចុចដដែលៗ"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0.2 វិ"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0.4 វិ"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0.6 វិ"</string>
     <string name="slow_keys" msgid="2891452895499690837">"គ្រាប់ចុចយឺត"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"កែតម្រូវរយៈពេលនៃការចុចគ្រាប់ចុចដើម្បីបើកដំណើរការ"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"គ្រាប់ចុចស្អិត"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"ចុចគ្រាប់ចុចមួយក្នុងមួយលើកសម្រាប់ផ្លូវកាត់ជំនួសឱ្យការចុចគ្រាប់ចុចឱ្យជាប់រួមគ្នា"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"គ្រាប់ចុច​ម៉ៅស៍"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"ប្រើក្តារចុចរបស់អ្នកដើម្បីគ្រប់គ្រងសញ្ញាព្រួញ"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"ការរំកិល​ម៉ៅស៍​បញ្រ្ចាស"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"រំកិល​ឡើងលើ ដើម្បីផ្លាស់ទី​ទំព័រចុះក្រោម"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"ដោះដូររវាងប៊ូតុងឆ្វេង និងប៊ូតុងស្ដាំ"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"ប្រើប៊ូតុងម៉ៅស៍ខាងឆ្វេងជាប៊ូតុងម៉ៅស៍ខាងស្ដាំរបស់អ្នក"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"ផ្លូវកាត់ក្តារចុច"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"បង្ហាញបញ្ជីផ្លូវកាត់"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"ឧបករណ៍ និងក្ដារចុច​កម្រងព័ត៌មាន​ការងារ"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"ជ្រើសរើសប៊ូតុងថ្មីសម្រាប់ <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>៖"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"ភាពងាយស្រួលប្រើប្រាស់ក្ដារចុចរូបវន្ត"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"គ្រាប់ចុចស្អិត គ្រាប់ចុចលោត គ្រាប់ចុចម៉ៅស៍"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"ប្លង់ <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"លំនាំដើម"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"មើលសាកល្បង"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"ជម្រើស​ស្តង់​ដារ​"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"ភាសា"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"ទំហំអក្សររត់"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"រចនាប័ទ្ម​អក្សររត់"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"ជម្រើស​តាម​តម្រូវ​ការ"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"ពណ៌​ផ្ទៃ​ខាងក្រោយ"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"ផ្តាច់ VPN នេះ?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"ផ្ដាច់"</string>
     <string name="vpn_version" msgid="6344167191984400976">"កំណែ"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"បំភ្លេច VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"ជំនួស VPN ដែលមានស្រាប់ឬ?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"កំណត់ VPN ឲ្យបើកជានិច្ចឬ?"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"ស្វែងរកការកំណត់"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"contacts, ទំហំ​ផ្ទុក, គណនី"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"ទំហំផ្ទុក Contacts"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"សម្រាប់តែឧបករណ៍"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"ទំនាក់ទំនងថ្មីៗនឹងមិនត្រូវបានធ្វើសមកាលកម្មជាមួយគណនីទេ"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"ទំនាក់ទំនងនឹងត្រូវបានរក្សាទុកទៅក្នុងឧបករណ៍របស់អ្នក និងធ្វើសមកាលកម្មទៅគណនីរបស់អ្នកតាមលំនាំដើម"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"មិន​បាន​កំណត់​លំនាំដើម"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"សូមបញ្ចូល​គណនី ដើម្បីចាប់ផ្ដើម"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-kn/arrays.xml b/res/values-kn/arrays.xml
index 3487549..815b2c7 100644
--- a/res/values-kn/arrays.xml
+++ b/res/values-kn/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"ಬ್ರೀಫ್‌ಕೇಸ್"</item>
-    <item msgid="184985872234062767">"ಶಾಸ್ತ್ರೀಯ ಶೈಲಿಯ ಕಟ್ಟಡ"</item>
-    <item msgid="9189550412466785530">"ಅಪಾರ್ಟ್‌ಮೆಂಟ್ ಕಟ್ಟಡ"</item>
-    <item msgid="2142527562511049422">"ಸ್ಪೀಚ್ ಬಬಲ್"</item>
-    <item msgid="2548100558260478605">"ಜನರ ಗುಂಪು"</item>
-    <item msgid="2270003903304578284">"ಲೈಟ್‌ಬಲ್ಬ್"</item>
-    <item msgid="4793496619091161864">"ಕ್ಯಾಲೆಂಡರ್"</item>
-    <item msgid="5673625795644364100">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ"</item>
-    <item msgid="1423820834865831361">"ವ್ಯಕ್ತಿಯೊಬ್ಬರು ಓಡುತ್ತಿರುವುದು"</item>
-    <item msgid="2037298830718732608">"ಗಾಲ್ಫ್"</item>
-    <item msgid="2197835014443491074">"ಜಿಮ್ ಡಂಬೆಲ್"</item>
-    <item msgid="2730180105015616518">"ಈಜು"</item>
-    <item msgid="2666922823253345958">"ವ್ಯಕ್ತಿಯೊಬ್ಬರು ಹೈಕಿಂಗ್ ಮಾಡುತ್ತಿರುವುದು"</item>
-    <item msgid="8234880356472211396">"ವ್ಯಕ್ತಿಯೊಬ್ಬರು ಚೆಂಡನ್ನು ಎಸೆಯುತ್ತಿರುವುದು"</item>
-    <item msgid="4642980625253001443">"ವ್ಯಕ್ತಿಯೊಬ್ಬರು ಒದೆಯುತ್ತಿರುವುದು"</item>
-    <item msgid="4324795269518833500">"ಗೇಮ್ ಕಂಟ್ರೋಲರ್"</item>
-    <item msgid="7789966425125441125">"ಕಲಾವಿದರ ಬಣ್ಣದ ಫಲಕ"</item>
-    <item msgid="663512680597461570">"ಸ್ನೋಫ್ಲೇಕ್"</item>
-    <item msgid="7952183800501346803">"ಬೀಚ್ ಛತ್ರಿಗಳು"</item>
-    <item msgid="799139025758265891">"ಕಾರ್ಯಾಗಾರದ ಟೂಲ್‌ಗಳು"</item>
-    <item msgid="1330084588359129896">"ಟೆಂಟ್"</item>
-    <item msgid="3861584909935022342">"ಫಿಲಂ ರೀಲ್"</item>
-    <item msgid="5827426100157335512">"ಕಾಯ್ದಿರಿಸಿ"</item>
-    <item msgid="8585828346253128384">"ಕಮಲದ ಹೂವು"</item>
-    <item msgid="8788370542815300188">"ವ್ಯಕ್ತಿಯ ಮನಸ್ಸು"</item>
-    <item msgid="7287354964767553293">"ಹೆಡ್‌ಫೋನ್‌ಗಳು"</item>
-    <item msgid="2530059623783800987">"ಟಿವಿ"</item>
-    <item msgid="5307182323469376758">"ರೈಲು"</item>
-    <item msgid="4903790544026923026">"ಕಾರ್"</item>
-    <item msgid="5010405583912314582">"ಫೋರ್ಕ್ ಮತ್ತು ಚಾಕು"</item>
-    <item msgid="8939998598599064900">"ಶಾಪಿಂಗ್ ಕಾರ್ಟ್"</item>
-    <item msgid="3379605903308731893">"ಮಗು"</item>
-    <item msgid="7808668968550293112">"ಪ್ರಾಣಿಯ ಪಂಜ"</item>
-    <item msgid="1000692647524056504">"ಸ್ಟಾರ್ ಬ್ಯಾಡ್ಜ್"</item>
-    <item msgid="8270261073421676502">"ಇಬ್ಬರು ವ್ಯಕ್ತಿಗಳು"</item>
-    <item msgid="5767782819651505460">"ನಕ್ಷತ್ರ"</item>
-    <item msgid="4368451291862729334">"ಹೃದಯ"</item>
-    <item msgid="2613199102208419986">"ಮನೆ"</item>
-    <item msgid="3022279986430275040">"ಅರ್ಧಚಂದ್ರ"</item>
-    <item msgid="5421089790869483206">"ಗಡಿಯಾರ"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 6fd0df1..2456080 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"ನಿಮ್ಮ ನೆಟ್‌ವರ್ಕ್ ಮತ್ತು ವೈರ್‌ಲೆಸ್ ಸಿಗ್ನಲ್‌ಗಳನ್ನು ಬಳಸಿಕೊಂಡು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸೆಟ್ ಮಾಡಿ"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"ಸ್ವಯಂಚಾಲಿತ ಸಮಯವಲಯ"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"ನಿಮ್ಮ ಸಮೀಪದ ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ಆಧರಿಸಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸೆಟ್ ಮಾಡಿ"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"ಲಭ್ಯವಿದ್ದರೆ, ನಿಮ್ಮ ಸಾಧನದ ಸ್ಥಳವನ್ನು ಬಳಸಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸೆಟ್ ಮಾಡಿ. ಸಕ್ರಿಯ Wi-Fi ಕನೆಕ್ಷನ್ ಬೇಕಾಗಬಹುದು."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"ಭಾಷೆ ಡೀಫಾಲ್ಟ್ ಬಳಸಿ"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-ಗಂಟೆ ಫಾರ್ಮ್ಯಾಟ್‌‌ ಬಳಸಿ"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"ಸಮಯ"</string>
@@ -1958,6 +1959,10 @@
     <string name="sticky_keys_summary" msgid="1844953803625480623">"ಕೀಗಳನ್ನು ಜೊತೆಯಾಗಿ ಕೆಳಗೆ ಹಿಡಿದಿಟ್ಟುಕೊಳ್ಳುವ ಬದಲಾಗಿ ಶಾರ್ಟ್‌ಕಟ್‌ಗಳಿಗಾಗಿ ಒಂದು ಬಾರಿ ಒಂದು ಕೀ ಅನ್ನು ಒತ್ತಿ"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"ಮೌಸ್ ಕೀಗಳು"</string>
     <string name="mouse_keys_summary" msgid="7030731235143286467">"ಪಾಯಿಂಟರ್ ಅನ್ನು ಕಂಟ್ರೋಲ್ ಮಾಡಲು ನಿಮ್ಮ ಕೀಬೋರ್ಡ್ ಅನ್ನು ಬಳಸಿ"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"ಮೌಸ್ ಹಿಮ್ಮುಖ ಸ್ಕ್ರಾಲ್ ಮಾಡುವಿಕೆ"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"ಪುಟವನ್ನು ಕೆಳಕ್ಕೆ ಸರಿಸಲು ಮೇಲಕ್ಕೆ ಸ್ಕ್ರಾಲ್ ಮಾಡಿ"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"ಎಡ ಮತ್ತು ಬಲ ಬಟನ್‌ಗಳನ್ನು ಬದಲಾಯಿಸಿ"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"ಎಡ ಮೌಸ್ ಬಟನ್ ಅನ್ನು ನಿಮ್ಮ ಬಲ ಬಟನ್‌ ಆಗಿ ಬಳಸಿ"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"ಕೀಬೋರ್ಡ್ ಶಾರ್ಟ್‌ಕಟ್‌ಗಳು"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"ಶಾರ್ಟ್‌ಕಟ್‌ಗಳ ಪಟ್ಟಿಯನ್ನು ತೋರಿಸಿ"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್ ಕೀಬೋರ್ಡ್‌ಗಳು ಮತ್ತು ಉಪಕರಣಗಳು"</string>
@@ -2026,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> ಗಾಗಿ ಹೊಸ ಕೀ ಆಯ್ಕೆಮಾಡಿ:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"ಭೌತಿಕ ಕೀಬೋರ್ಡ್ ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"ಸ್ಟಿಕಿ ಕೀಗಳು, ಬೌನ್ಸ್ ಕೀಗಳು, ಮೌಸ್ ಕೀಗಳು"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> ಲೇಔಟ್"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ಡಿಫಾಲ್ಟ್"</string>
@@ -2434,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"ಪೂರ್ವವೀಕ್ಷಣೆ"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"ಪ್ರಮಾಣಿತ ಆಯ್ಕೆಗಳು"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"ಭಾಷೆ"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"ಕ್ಯಾಪ್ಶನ್ ಗಾತ್ರ"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"ಶೀರ್ಷಿಕೆಯ ಶೈಲಿ"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"ಕಸ್ಟಮ್‌ ಆಯ್ಕೆಗಳು"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"ಹಿನ್ನೆಲೆ ಬಣ್ಣ"</string>
@@ -2979,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"ಈ VPN ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸುವುದೇ?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಿ"</string>
     <string name="vpn_version" msgid="6344167191984400976">"ಆವೃತ್ತಿ"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN ಮರೆತುಬಿಡು"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ VPN ಸ್ಥಾನಾಂತರಿಸುವುದೇ?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"VPN ಯಾವಾಗಲೂ ಆನ್ ಆಗಿರುವಂತೆ ಹೊಂದಿಸುವುದೇ?"</string>
@@ -5459,4 +5469,8 @@
     <string name="contacts_storage_selection_message" msgid="8082077300632059003">"ಸಂಪರ್ಕಗಳನ್ನು ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಸೇವ್ ಮಾಡಲಾಗುತ್ತದೆ ಮತ್ತು ಡೀಫಾಲ್ಟ್ ಆಗಿ ನಿಮ್ಮ ಖಾತೆಗೆ ಸಿಂಕ್ ಮಾಡಲಾಗುತ್ತದೆ"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"ಡೀಫಾಲ್ಟ್ ಆಗಿ ಯಾವುದನ್ನೂ ಸೆಟ್ ಮಾಡಿಲ್ಲ"</string>
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"ಪ್ರಾರಂಭಿಸಲು ಒಂದು ಖಾತೆಯನ್ನು ಸೇರಿಸಿ"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
+    <skip />
 </resources>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index babd76d..b21f8ec 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"서류 가방"</item>
-    <item msgid="184985872234062767">"고전 건물"</item>
-    <item msgid="9189550412466785530">"아파트"</item>
-    <item msgid="2142527562511049422">"말풍선"</item>
-    <item msgid="2548100558260478605">"한 무리의 사람들"</item>
-    <item msgid="2270003903304578284">"전구"</item>
-    <item msgid="4793496619091161864">"캘린더"</item>
-    <item msgid="5673625795644364100">"방해 금지 모드"</item>
-    <item msgid="1423820834865831361">"달리는 사람"</item>
-    <item msgid="2037298830718732608">"골프"</item>
-    <item msgid="2197835014443491074">"헬스장 덤벨"</item>
-    <item msgid="2730180105015616518">"수영"</item>
-    <item msgid="2666922823253345958">"하이킹 중인 사람"</item>
-    <item msgid="8234880356472211396">"공을 던지는 사람"</item>
-    <item msgid="4642980625253001443">"발차기를 하는 사람"</item>
-    <item msgid="4324795269518833500">"게임 컨트롤러"</item>
-    <item msgid="7789966425125441125">"아티스트 색상 팔레트"</item>
-    <item msgid="663512680597461570">"눈송이"</item>
-    <item msgid="7952183800501346803">"비치 파라솔"</item>
-    <item msgid="799139025758265891">"워크숍 도구"</item>
-    <item msgid="1330084588359129896">"텐트"</item>
-    <item msgid="3861584909935022342">"필름 릴"</item>
-    <item msgid="5827426100157335512">"책"</item>
-    <item msgid="8585828346253128384">"연꽃"</item>
-    <item msgid="8788370542815300188">"사람의 마음"</item>
-    <item msgid="7287354964767553293">"헤드폰"</item>
-    <item msgid="2530059623783800987">"TV"</item>
-    <item msgid="5307182323469376758">"기차"</item>
-    <item msgid="4903790544026923026">"자동차"</item>
-    <item msgid="5010405583912314582">"포크와 나이프"</item>
-    <item msgid="8939998598599064900">"장바구니"</item>
-    <item msgid="3379605903308731893">"아이"</item>
-    <item msgid="7808668968550293112">"동물 발"</item>
-    <item msgid="1000692647524056504">"별표 배지"</item>
-    <item msgid="8270261073421676502">"두 사람"</item>
-    <item msgid="5767782819651505460">"별"</item>
-    <item msgid="4368451291862729334">"하트"</item>
-    <item msgid="2613199102208419986">"집"</item>
-    <item msgid="3022279986430275040">"반달"</item>
-    <item msgid="5421089790869483206">"시계"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 22c7755..a345709 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"네트워크 및 무선 신호를 사용하여 자동으로 설정합니다."</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"시간대 자동 설정"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"주변의 모바일 네트워크를 기반으로 자동으로 설정합니다."</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"가능한 경우, 기기 위치를 사용하여 자동으로 설정합니다. 활성 상태의 Wi-Fi 연결도 필요할 수 있습니다."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"언어 기본값 사용"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24시간 형식 사용"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"시간"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"접근성"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"물리적 키보드"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"바운스 키"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"동일한 키를 빠르게 반복해서 누를 시 키보드에서 이를 무시합니다."</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"바운스 키 기준점"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"키보드에서 반복 키 입력을 무시하는 시간을 선택하세요"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0.2초"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0.4초"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0.6초"</string>
     <string name="slow_keys" msgid="2891452895499690837">"느린 키"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"키를 누를 때 활성화하기까지 걸리는 시간을 조정합니다."</string>
     <string name="sticky_keys" msgid="7317317044898161747">"고정키"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"단축키를 사용할 때 키를 함께 누르지 않고 한 번에 하나씩 누릅니다"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"마우스 키"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"키보드를 사용하여 포인터를 제어합니다."</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"마우스 역방향 스크롤"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"위로 스크롤하여 페이지 아래로 이동합니다."</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"왼쪽 및 오른쪽 버튼 바꾸기"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"왼쪽 마우스 버튼을 오른쪽 버튼으로 사용합니다."</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"단축키"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"단축키 목록 표시"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"직장 프로필 키보드 및 도구"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>의 새 키 선택:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"실제 키보드 접근성"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"고정키, 바운스 키, 마우스 키"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> 레이아웃"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"기본"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"미리보기"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"표준 옵션"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"언어"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"자막 크기"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"자막 스타일"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"맞춤설정 옵션"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"배경색"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"이 VPN을 연결 해제하시겠습니까?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"연결 해제"</string>
     <string name="vpn_version" msgid="6344167191984400976">"버전"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN 삭제"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"기존 VPN을 교체하시겠습니까?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"연결 유지 VPN을 설정하시겠습니까?"</string>
@@ -3823,7 +3825,7 @@
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{없음}=1{대화 1개}other{대화 #개}}"</string>
     <string name="zen_mode_from_conversations_settings" msgid="2411930666794576607">"대화 설정"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"예외 대상"</string>
-    <string name="zen_mode_people_footer" msgid="7710707353004137431">"메시지 또는 전화 앱에서 나에게 알림을 전송할 수 없을 때에도 여기에서 선택한 사용자는 앱을 통해 나에게 연락할 수 있습니다."</string>
+    <string name="zen_mode_people_footer" msgid="7710707353004137431">"메시지 또는 전화 앱에서 나에게 알림을 전송할 수 없을 때에도 여기에서 선택한 사람은 이러한 앱을 통해 나에게 연락할 수 있습니다."</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"전화"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"전화"</string>
     <string name="zen_mode_calls_list" msgid="5044730950895749093">"전화"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"설정 검색"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"연락처, 저장소, 계정"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"연락처 저장소"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"기기만"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"새 연락처는 계정과 동기화되지 않습니다."</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"연락처가 기기에 저장되고 기본적으로 계정과 동기화됩니다."</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"기본 설정 없음"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"계정을 추가하여 시작하세요."</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-ky/arrays.xml b/res/values-ky/arrays.xml
index ecd3a22..4288f15 100644
--- a/res/values-ky/arrays.xml
+++ b/res/values-ky/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Портфель"</item>
-    <item msgid="184985872234062767">"Классикалык имарат"</item>
-    <item msgid="9189550412466785530">"Көп кабаттуу үй"</item>
-    <item msgid="2142527562511049422">"Кеп булутчасы"</item>
-    <item msgid="2548100558260478605">"Адамдардын тобу"</item>
-    <item msgid="2270003903304578284">"Электр лампасы"</item>
-    <item msgid="4793496619091161864">"Жылнаама"</item>
-    <item msgid="5673625795644364100">"Тынчымды алба"</item>
-    <item msgid="1423820834865831361">"Чуркап бараткан киши"</item>
-    <item msgid="2037298830718732608">"Гольф"</item>
-    <item msgid="2197835014443491074">"Спортзалдагы гантель"</item>
-    <item msgid="2730180105015616518">"Сууда сүзүү"</item>
-    <item msgid="2666922823253345958">"Сейилдеп бараткан киши"</item>
-    <item msgid="8234880356472211396">"Топ ыргытып жаткан киши"</item>
-    <item msgid="4642980625253001443">"Тээп жаткан киши"</item>
-    <item msgid="4324795269518833500">"Оюн көзөмөлдөгүчү"</item>
-    <item msgid="7789966425125441125">"Сүрөтчүнүн түстөр топтому"</item>
-    <item msgid="663512680597461570">"Кар бүртүгү"</item>
-    <item msgid="7952183800501346803">"Кумдуу жээктеги чатыр"</item>
-    <item msgid="799139025758265891">"Устаканадагы аспаптар"</item>
-    <item msgid="1330084588359129896">"Чатыр"</item>
-    <item msgid="3861584909935022342">"Тасма түрмөгү"</item>
-    <item msgid="5827426100157335512">"Аудиокитеп"</item>
-    <item msgid="8585828346253128384">"Лотос гүлү"</item>
-    <item msgid="8788370542815300188">"Адамдын акылы"</item>
-    <item msgid="7287354964767553293">"Гарнитура"</item>
-    <item msgid="2530059623783800987">"Сыналгы"</item>
-    <item msgid="5307182323469376758">"Поезд"</item>
-    <item msgid="4903790544026923026">"Унаа"</item>
-    <item msgid="5010405583912314582">"Вилка жана бычак"</item>
-    <item msgid="8939998598599064900">"Себет"</item>
-    <item msgid="3379605903308731893">"Бала"</item>
-    <item msgid="7808668968550293112">"Жаныбардын таманы"</item>
-    <item msgid="1000692647524056504">"Жылдызча бейджиги"</item>
-    <item msgid="8270261073421676502">"Эки киши"</item>
-    <item msgid="5767782819651505460">"Жылдыз"</item>
-    <item msgid="4368451291862729334">"Жүрөк"</item>
-    <item msgid="2613199102208419986">"Башкы бет"</item>
-    <item msgid="3022279986430275040">"Жарым ай"</item>
-    <item msgid="5421089790869483206">"Саат"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 877a930..1040688 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Тармак жана зымсыз сигналдар аркылуу автоматтык түрдө орнотуу"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Убакыт алкагын автоматтык түрдө аныктоо"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Жаныңыздагы мобилдик тармактардын негизинде автоматтык түрдө орнотуу"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Түзмөктүн турган жеринин негизинде автоматтык түрдө орнотуу. Wifi\'га туташуу керектелиши мүмкүн."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Демейки жергиликтүү форматты колдонуу"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24 сааттык форматты колдонуу"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Убакыт"</string>
@@ -1958,6 +1959,10 @@
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Ыкчам баскычтарды чогуу басып туруунун ордуна бирден басасыз"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Чычкандын баскычтары"</string>
     <string name="mouse_keys_summary" msgid="7030731235143286467">"Курсорду баскычтоптон көзөмөлдөңүз"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Чычкан менен артка сыдыруу"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Баракты ылдый жылдыруу үчүн экранды өйдө сыдырыңыз"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Сол жана оң баскычтарды алмаштырыңыз"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Чычкандын сол баскычын оң баскыч катары колдонуңуз"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Ыкчам баскычтар"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Ыкчам баскычтардын тизмеси көрүнөт"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Жумуш профилинин баскычтоптору жана куралдары"</string>
@@ -2026,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> үчүн жаңы ачкыч тандаңыз:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Аппараттык баскычтоптогу атайын мүмкүнчүлүктөр"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Жабышма баскычтар, Кайтаруу баскычтары, Чычкандын баскычтары"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> калыбы"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Демейки"</string>
@@ -2434,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Алдын ала көрүү"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Стандарттык опциялар"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Тили"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Коштомо жазуунун өлчөмү"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Коштомо жазуунун стили"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Ылайыкташтырылган тууралоолор"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Фондун түсү"</string>
@@ -2979,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Бул VPN ажыратылсынбы?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Ажыратуу"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Версия"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN профили унутулсун"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Учурдагы VPN алмаштырылсынбы?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Туруктуу VPN\'ди жөндөйсүзбү?"</string>
@@ -5459,4 +5469,8 @@
     <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Байланыштар түзмөгүңүздө сакталып, аккаунтуңузда демейки шартта шайкештирилет"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Демейки параметрлер коюлган жок"</string>
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Баштоо үчүн аккаунт кошуңуз"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
+    <skip />
 </resources>
diff --git a/res/values-lo/arrays.xml b/res/values-lo/arrays.xml
index 6dcbd8d..eaf83c8 100644
--- a/res/values-lo/arrays.xml
+++ b/res/values-lo/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"ກະເປົາເອກະສານ"</item>
-    <item msgid="184985872234062767">"ອາຄານຄລາດສິກ"</item>
-    <item msgid="9189550412466785530">"ຕຶກອະພາດເມັນ"</item>
-    <item msgid="2142527562511049422">"ຟອງຄຳເວົ້າ"</item>
-    <item msgid="2548100558260478605">"ກຸ່ມຄົນ"</item>
-    <item msgid="2270003903304578284">"ຫຼອດໄຟ"</item>
-    <item msgid="4793496619091161864">"ປະຕິທິນ"</item>
-    <item msgid="5673625795644364100">"ຫ້າມລົບກວນ"</item>
-    <item msgid="1423820834865831361">"ຄົນແລ່ນ"</item>
-    <item msgid="2037298830718732608">"ກັອບ"</item>
-    <item msgid="2197835014443491074">"ດຳເບວສຳລັບຢີມ"</item>
-    <item msgid="2730180105015616518">"ການລອຍນ້ຳ"</item>
-    <item msgid="2666922823253345958">"ຄົນຍ່າງປ່າ"</item>
-    <item msgid="8234880356472211396">"ຄົນໂຍນບານ"</item>
-    <item msgid="4642980625253001443">"ຄົນເຮັດທ່າເຕະ"</item>
-    <item msgid="4324795269518833500">"ມືເກມ"</item>
-    <item msgid="7789966425125441125">"ຖາດສີຂອງສິນລະປິນ"</item>
-    <item msgid="663512680597461570">"ເກັດຫິມະ"</item>
-    <item msgid="7952183800501346803">"ຄັນຮົ່ມຫາດຊາຍ"</item>
-    <item msgid="799139025758265891">"ເຄື່ອງມືເວີກຊັອບ"</item>
-    <item msgid="1330084588359129896">"ເຕັ້ນ"</item>
-    <item msgid="3861584909935022342">"ມ້ວນຟີມ"</item>
-    <item msgid="5827426100157335512">"ປຶ້ມ"</item>
-    <item msgid="8585828346253128384">"ດອກບົວ"</item>
-    <item msgid="8788370542815300188">"ຈິດໃຈຄົນ"</item>
-    <item msgid="7287354964767553293">"ຫູຟັງ"</item>
-    <item msgid="2530059623783800987">"ໂທລະທັດ"</item>
-    <item msgid="5307182323469376758">"ລົດໄຟ"</item>
-    <item msgid="4903790544026923026">"ລົດ"</item>
-    <item msgid="5010405583912314582">"ສ້ອມ ແລະ ມີດ"</item>
-    <item msgid="8939998598599064900">"ກະຕ່າຊື້ເຄື່ອງ"</item>
-    <item msgid="3379605903308731893">"ເດັກນ້ອຍ"</item>
-    <item msgid="7808668968550293112">"ຕີນສັດ"</item>
-    <item msgid="1000692647524056504">"ປ້າຍດາວ"</item>
-    <item msgid="8270261073421676502">"ຄົນ 2 ຄົນ"</item>
-    <item msgid="5767782819651505460">"ດາວ"</item>
-    <item msgid="4368451291862729334">"ຫົວໃຈ"</item>
-    <item msgid="2613199102208419986">"ເຮືອນ"</item>
-    <item msgid="3022279986430275040">"ເດືອນເຄິ່ງດວງ"</item>
-    <item msgid="5421089790869483206">"ໂມງ"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 2207ee4..78d00ed 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"ຕັ້ງຄ່າອັດຕະໂນມັດໂດຍໃຊ້ເຄືອຂ່າຍ ແລະ ສັນຍານໄຮ້ສາຍຂອງທ່ານ"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"ເຂດເວລາອັດຕະໂນມັດ"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"ຕັ້ງຄ່າອັດຕະໂນມັດໂດຍອີງຕາມເຄືອຂ່າຍມືຖືທີ່ຢູ່ໃກ້ກັບທ່ານ"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"ຕັ້ງຄ່າອັດຕະໂນມັດໂດຍໃຊ້ສະຖານທີ່ອຸປະກອນຂອງທ່ານ (ຫາກມີ). ອາດຕ້ອງມີການເຊື່ອມຕໍ່ Wi-Fi ທີ່ເປີດໃຊ້ຢູ່ນຳ."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"ໃຊ້ຄ່າເລີ່ມຕົ້ນຂອງສະຖານທີ່"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"ໃຊ້ຮູບແບບ 24 ຊົ່ວໂມງ"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"ເວລາ"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"ການຊ່ວຍເຂົ້າເຖິງ"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"ແປ້ນພິມພາຍນອກ"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"ປຸ່ມດີດກັບ"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"ແປ້ນພິມຈະບໍ່ສົນໃຈການກົດປຸ່ມຊ້ຳໆໄວໆຂອງປຸ່ມດຽວກັນ"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"ເກນການຍົກເລີກການກົດປຸ່ມຊໍ້າໆ"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"ເລືອກໄລຍະເວລາທີ່ແປ້ນພິມຂອງທ່ານບໍ່ສົນໃຈການກົດປຸ່ມຊໍ້າໆ"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0.2ວິ"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0.4ວິ"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0.6ວິ"</string>
     <string name="slow_keys" msgid="2891452895499690837">"ເພີ່ມໄລຍະເວລາໃນການກົດປຸ່ມ"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"ປັບແກ້ເວລາທີ່ມັນໃຊ້ສໍາລັບການກົດປຸ່ມເພື່ອເປີດໃຊ້"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"ປຸ່ມກົດຄ້າງ"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"ກົດເທື່ອລະປຸ່ມເພື່ອໃຊ້ທາງລັດແທນການກົດປຸ່ມຄ້າງໄວ້ຮ່ວມກັນ"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"ແປ້ນເມົ້າ"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"ໃຊ້ແປ້ນພິມຂອງທ່ານເພື່ອຄວບຄຸມຕົວຊີ້"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"ການເລື່ອນເມົ້າຖອຍຫຼັງ"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"ເລື່ອນຂຶ້ນເພື່ອຍ້າຍໜ້າລົງ"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"ສະຫຼັບປຸ່ມຊ້າຍ ແລະ ຂວາ"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"ໃຊ້ປຸ່ມເມົ້າເບື້ອງຊ້າຍເປັນປຸ່ມເບື້ອງຂວາຂອງທ່ານ"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"ປຸ່ມລັດແປ້ນພິມ"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"ສະແດງລາຍຊື່ຂອງທາງລັດ"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"ແປ້ນພິມໂປຣໄຟລ໌ວຽກ ແລະ ເຄື່ອງມື"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"ເລືອກປຸ່ມໃໝ່ສຳລັບ <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"ການຊ່ວຍເຂົ້າເຖິງແປ້ນພິມພາຍນອກ"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"ປຸ່ມກົດຄ້າງ, ປຸ່ມຕີກັບ, ແປ້ນເມົ້າ"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"ໂຄງຮ່າງ <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ຄ່າເລີ່ມຕົ້ນ"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"ຕົວຢ່າງ"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"ໂຕເລືອກມາດຕະຖານ"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"ພາສາ"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"ຂະໜາດຄຳບັນຍາຍ"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"ຮູບແບບຄຳບັນຍາຍ"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"ໂຕເລືອກກຳນົດເອງ"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"ສີພື້ນຫຼັງ"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"ຕັດການເຊື່ອມຕໍ່ VPN ນີ້ບໍ?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"ຕັດການເຊື່ອມຕໍ່"</string>
     <string name="vpn_version" msgid="6344167191984400976">"ເວີຊັນ"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"ລືມ VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"ຂຽນທັບ VPN ທີ່ມີຢູ່ກ່ອນແລ້ວຂອງທ່ານບໍ?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Set always-on VPN?"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"ຊອກຫາໃນການຕັ້ງຄ່າ"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"ລາຍຊື່ຜູ້ຕິດຕໍ່, ບ່ອນຈັດເກັບຂໍ້ມູນ, ບັນຊີ"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"ບ່ອນຈັດເກັບຂໍ້ມູນລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"ອຸປະກອນເທົ່ານັ້ນ"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"ລາຍຊື່ຜູ້ຕິດຕໍ່ໃໝ່ຈະບໍ່ຖືກຊິ້ງຂໍ້ມູນກັບບັນຊີ"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"ລາຍຊື່ຜູ້ຕິດຕໍ່ຈະຖືກບັນທຶກໄປໃສ່ອຸປະກອນ ແລະ ຊິ້ງຂໍ້ມູນໄປຫາບັນຊີຂອງທ່ານເປັນຄ່າເລີ່ມຕົ້ນ"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"ບໍ່ມີການຕັ້ງຄ່າເລີ່ມຕົ້ນ"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"ເພີ່ມບັນຊີເພື່ອເລີ່ມຕົ້ນ"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index af16799..e12eb91 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Portfelis"</item>
-    <item msgid="184985872234062767">"Klasikinis pastatas"</item>
-    <item msgid="9189550412466785530">"Daugiabutis namas"</item>
-    <item msgid="2142527562511049422">"Kalbos debesėlis"</item>
-    <item msgid="2548100558260478605">"Žmonių grupė"</item>
-    <item msgid="2270003903304578284">"Lemputė"</item>
-    <item msgid="4793496619091161864">"Kalendorius"</item>
-    <item msgid="5673625795644364100">"Netrukdymo režimas"</item>
-    <item msgid="1423820834865831361">"Bėgantis asmuo"</item>
-    <item msgid="2037298830718732608">"Golfas"</item>
-    <item msgid="2197835014443491074">"Sporto hanteliai"</item>
-    <item msgid="2730180105015616518">"Plaukimas"</item>
-    <item msgid="2666922823253345958">"Žygiuojantis asmuo"</item>
-    <item msgid="8234880356472211396">"Kamuolį metantis asmuo"</item>
-    <item msgid="4642980625253001443">"Spiriantis asmuo"</item>
-    <item msgid="4324795269518833500">"Žaidimų valdiklis"</item>
-    <item msgid="7789966425125441125">"Atlikėjo spalvų gama"</item>
-    <item msgid="663512680597461570">"Snaigė"</item>
-    <item msgid="7952183800501346803">"Paplūdimio skėtis"</item>
-    <item msgid="799139025758265891">"Darbo įrankiai"</item>
-    <item msgid="1330084588359129896">"Palapinė"</item>
-    <item msgid="3861584909935022342">"Kino juosta"</item>
-    <item msgid="5827426100157335512">"Knyga"</item>
-    <item msgid="8585828346253128384">"Lotoso žiedas"</item>
-    <item msgid="8788370542815300188">"Asmens mintis"</item>
-    <item msgid="7287354964767553293">"Ausinės"</item>
-    <item msgid="2530059623783800987">"TV"</item>
-    <item msgid="5307182323469376758">"Traukinys"</item>
-    <item msgid="4903790544026923026">"Automobilis"</item>
-    <item msgid="5010405583912314582">"Šakutė ir peilis"</item>
-    <item msgid="8939998598599064900">"Pirkinių krepšelis"</item>
-    <item msgid="3379605903308731893">"Vaikas"</item>
-    <item msgid="7808668968550293112">"Gyvūno letena"</item>
-    <item msgid="1000692647524056504">"Žvaigždutės ženklelis"</item>
-    <item msgid="8270261073421676502">"Du žmonės"</item>
-    <item msgid="5767782819651505460">"Žvaigždė"</item>
-    <item msgid="4368451291862729334">"Širdis"</item>
-    <item msgid="2613199102208419986">"Namas"</item>
-    <item msgid="3022279986430275040">"Pusmėnulis"</item>
-    <item msgid="5421089790869483206">"Laikrodis"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 73a6572..7b0e2dd 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Nustatykite automatiškai pagal tinklo ir belaidžio ryšio signalus"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Automatinė laiko juosta"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Nustatykite automatiškai pagal netoliese esančius mobiliojo ryšio tinklus"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Nustatykite automatiškai pagal įrenginio vietovę, jei ji pasiekiama. Taip pat gali būti reikalingas aktyvus „Wi-Fi“ ryšys."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Naudoti numatytuosius lokalės nustatymus"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Naudoti 24 val. formatą"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Laikas"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Pritaikomumas"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Fizinė klaviatūra"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Peradresavimo klavišai"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Klaviatūra nepaiso greitai kartojamų to paties klavišo paspaudimų"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Peradresavimo klavišų slenkstis"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Pasirinkite, kiek laiko klaviatūra nepaiso pasikartojančių klavišų paspaudimų"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2 sek."</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4 sek."</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0,6 sek."</string>
     <string name="slow_keys" msgid="2891452895499690837">"Lėtieji klavišai"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Koreguojamas laikas, per kurį aktyvinamas klavišo paspaudimas"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Atmenieji klavišai"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Norėdami naudoti spartųjį klavišą, vienu metu paspauskite vieną klavišą, užuot laikę nuspaudę kelis klavišus"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Pelės klavišai"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Naudodami klaviatūrą valdykite žymeklį"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Atvirkštinis slinkimas pele"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Slinkite aukštyn, kad pereitumėte puslapiu žemyn"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Sukeisti kairįjį ir dešinįjį mygtukus"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Naudokite kairįjį pelės mygtuką kaip dešinįjį"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Spartieji klavišai"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Rodyti sparčiųjų klavišų sąrašą"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Darbo profilio klaviatūros ir įrankiai"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Pasirinkite naują „<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>“ slaptažodį:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Fizinės klaviatūros pritaikomumas"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Atmenieji klavišai, pakartotinių paspaudimų kontrolė, pelės klavišai"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"„<xliff:g id="IME_LABEL">%s</xliff:g>“ išdėstymas"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Numatytasis"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Peržiūra"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standartinės parinktys"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Kalba"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Subtitrų dydis"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Subtitrų stilius"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Tinkintos parinktys"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Fono spalva"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Atsijungti nuo šio VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Atsijungti"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versija"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Pamiršti VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Pakeisti esamą VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Nustatyti visada įjungtą VPN?"</string>
@@ -5464,13 +5466,11 @@
     <string name="homepage_search" msgid="6759334912284663559">"Nustatymų paieška"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"kontaktai, saugykla, paskyra"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Kontaktų saugykla"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Tik įrenginys"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Nauji kontaktai nebus sinchronizuojami su paskyra"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Pagal numatytuosius nustatymus kontaktai bus išsaugomi įrenginyje ir sinchronizuojami su paskyra"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Numatytoji paskyra nenustatyta"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
-    <skip />
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Jei norite pradėti, pridėkite paskyrą"</string>
+    <string name="search_gesture_feature_title" msgid="7037117019612710960">"Paieška apibrėžiant"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Jei norite ieškoti naudodami turinį ekrane, palieskite ir palaikykite pagrindinio puslapio mygtuką arba naršymo rankenėlę."</string>
 </resources>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index 4412a86..3736b30 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Portfelis"</item>
-    <item msgid="184985872234062767">"Klasiska ēka"</item>
-    <item msgid="9189550412466785530">"Daudzdzīvokļu māja"</item>
-    <item msgid="2142527562511049422">"Runas burbulis"</item>
-    <item msgid="2548100558260478605">"Personu grupa"</item>
-    <item msgid="2270003903304578284">"Spuldze"</item>
-    <item msgid="4793496619091161864">"Kalendārs"</item>
-    <item msgid="5673625795644364100">"Netraucēt"</item>
-    <item msgid="1423820834865831361">"Cilvēks skrien"</item>
-    <item msgid="2037298830718732608">"Golfs"</item>
-    <item msgid="2197835014443491074">"Sporta zāles hantele"</item>
-    <item msgid="2730180105015616518">"Peldēšana"</item>
-    <item msgid="2666922823253345958">"Cilvēks pārgājienā"</item>
-    <item msgid="8234880356472211396">"Cilvēks met bumbu"</item>
-    <item msgid="4642980625253001443">"Cilvēks sper"</item>
-    <item msgid="4324795269518833500">"Spēles vadāmierīce"</item>
-    <item msgid="7789966425125441125">"Mākslinieka krāsu palete"</item>
-    <item msgid="663512680597461570">"Sniegpārsliņa"</item>
-    <item msgid="7952183800501346803">"Saulessargs"</item>
-    <item msgid="799139025758265891">"Darbnīcas rīki"</item>
-    <item msgid="1330084588359129896">"Telts"</item>
-    <item msgid="3861584909935022342">"Filmas rullītis"</item>
-    <item msgid="5827426100157335512">"Grāmata"</item>
-    <item msgid="8585828346253128384">"Lotosa zieds"</item>
-    <item msgid="8788370542815300188">"Cilvēka prāts"</item>
-    <item msgid="7287354964767553293">"Austiņas"</item>
-    <item msgid="2530059623783800987">"Televizors"</item>
-    <item msgid="5307182323469376758">"Vilciens"</item>
-    <item msgid="4903790544026923026">"Automašīna"</item>
-    <item msgid="5010405583912314582">"Nazis un dakšiņa"</item>
-    <item msgid="8939998598599064900">"Iepirkumu grozs"</item>
-    <item msgid="3379605903308731893">"Bērns"</item>
-    <item msgid="7808668968550293112">"Dzīvnieka ķepa"</item>
-    <item msgid="1000692647524056504">"Zvaigznītes emblēma"</item>
-    <item msgid="8270261073421676502">"Divi cilvēki"</item>
-    <item msgid="5767782819651505460">"Zvaigzne"</item>
-    <item msgid="4368451291862729334">"Sirds"</item>
-    <item msgid="2613199102208419986">"Māja"</item>
-    <item msgid="3022279986430275040">"Pusmēness"</item>
-    <item msgid="5421089790869483206">"Pulkstenis"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index d5fcafd..932ed7c 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Iestatīt automātiski, izmantojot tīklu un bezvadu signālus."</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Automātiska laika joslu noteikšana"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Iestatīt automātiski, ņemot vērā mobilos tīklus jūsu tuvumā."</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Iestatīt, izmantojot ierīces atrašanās vietu (ja pieejama). Var vajadzēt aktīvu Wi-Fi savienojumu."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Izmantot lokalizācijas noklusējuma vērtību"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Izmantot 24 stundu formātu"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Laiks"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Pieejamība"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Fiziskā tastatūra"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Atlēcienu taustiņi"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Tastatūra ignorē ātri atkārtotu viena taustiņa nospiešanu."</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Atlēcienu taustiņu slieksnis"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Izvēlieties, cik ilgi tastatūra ignorēs atkārtotu taustiņu nospiešanu."</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2 s"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4 s"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0,6 s"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Lēnie taustiņi"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Tiek pielāgots laiks, kas nepieciešams, lai aktivizētu nospiestu taustiņu."</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Taustiņu ķēde"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Izmantojot īsinājumtaustiņus, vienlaikus nospiediet tikai vienu taustiņu, nevis turiet nospiestus vairākus taustiņus."</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Peles taustiņi"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Izmantojiet tastatūru, lai kontrolētu rādītāju."</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Peles ritināšana atpakaļgaitā"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Ritiniet augšup, lai pārvietotu lapu uz leju"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Apmainīt vietām kreiso un labo pogu"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Izmantojiet peles kreiso pogu kā labo"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Īsinājumtaustiņi"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Rādīt īsinājumtaustiņu sarakstu"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Tastatūras un rīki darba profilā"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Izvēlieties jaunu taustiņu — <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Fiziskās tastatūras pieejamība"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Taustiņu ķēde, atlēcienu taustiņi, peles taustiņi"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Izkārtojums: <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Noklusējums"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Priekšskatījums"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standarta opcijas"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Valoda"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Parakstu lielums"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Subtitru stils"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Pielāgotas opcijas"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Fona krāsa"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Vai pārtraukt šo VPN savienojumu?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Pārtraukt savienojumu"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versija"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Aizmirst VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Vai aizstāt esošo VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Vai iestatīt vienmēr ieslēgtu VPN?"</string>
@@ -5463,13 +5465,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Meklēšanas iestatījumi"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"kontaktpersonas, krātuve, konts"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Kontaktpersonu krātuve"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Tikai ierīcē"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Jaunas kontaktpersonas netiks sinhronizētas ar kontu."</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Pēc noklusējuma kontaktpersonas tiks saglabātas jūsu ierīcē un sinhronizētas ar jūsu kontu."</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Nav iestatīts noklusējuma konts"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Lai sāktu darbu, pievienojiet kontu."</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-mk/arrays.xml b/res/values-mk/arrays.xml
index 916f2a3..3449e5f 100644
--- a/res/values-mk/arrays.xml
+++ b/res/values-mk/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Актовка"</item>
-    <item msgid="184985872234062767">"Класична зграда"</item>
-    <item msgid="9189550412466785530">"Станбена зграда"</item>
-    <item msgid="2142527562511049422">"Балонче за говор"</item>
-    <item msgid="2548100558260478605">"Група луѓе"</item>
-    <item msgid="2270003903304578284">"Светилка"</item>
-    <item msgid="4793496619091161864">"Календар"</item>
-    <item msgid="5673625795644364100">"Не вознемирувај"</item>
-    <item msgid="1423820834865831361">"Лице кое трча"</item>
-    <item msgid="2037298830718732608">"Голф"</item>
-    <item msgid="2197835014443491074">"Тег за теретана"</item>
-    <item msgid="2730180105015616518">"Пливање"</item>
-    <item msgid="2666922823253345958">"Лице кое планинари"</item>
-    <item msgid="8234880356472211396">"Лице кое фрла топка"</item>
-    <item msgid="4642980625253001443">"Лице кое клоца"</item>
-    <item msgid="4324795269518833500">"Контролер за игри"</item>
-    <item msgid="7789966425125441125">"Палета на бои за изведувачи"</item>
-    <item msgid="663512680597461570">"Снегулка"</item>
-    <item msgid="7952183800501346803">"Чадор за плажа"</item>
-    <item msgid="799139025758265891">"Алати во работилница"</item>
-    <item msgid="1330084588359129896">"Шатор"</item>
-    <item msgid="3861584909935022342">"Филмска лента"</item>
-    <item msgid="5827426100157335512">"Книга"</item>
-    <item msgid="8585828346253128384">"Цвет на лотос"</item>
-    <item msgid="8788370542815300188">"Умот на лицето"</item>
-    <item msgid="7287354964767553293">"Слушалки"</item>
-    <item msgid="2530059623783800987">"ТВ"</item>
-    <item msgid="5307182323469376758">"Воз"</item>
-    <item msgid="4903790544026923026">"Автомобил"</item>
-    <item msgid="5010405583912314582">"Вилушка и нож"</item>
-    <item msgid="8939998598599064900">"Кошничка"</item>
-    <item msgid="3379605903308731893">"Дете"</item>
-    <item msgid="7808668968550293112">"Животинска шепа"</item>
-    <item msgid="1000692647524056504">"Значка со ѕвезда"</item>
-    <item msgid="8270261073421676502">"Две лица"</item>
-    <item msgid="5767782819651505460">"Ѕвезда"</item>
-    <item msgid="4368451291862729334">"Срце"</item>
-    <item msgid="2613199102208419986">"Куќа"</item>
-    <item msgid="3022279986430275040">"Полумесечина"</item>
-    <item msgid="5421089790869483206">"Часовник"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 6fa7263..279561f 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Поставете автоматски со вашата мрежа и безжични сигнали"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Автоматска временска зона"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Поставете автоматски според мобилните мрежи во ваша близина"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Поставете автоматски со локацијата на уредот, ако е достапна. Може да треба и активна Wi-Fi врска."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Користи локален стандард"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Користи 24-часовен формат"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Време"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Пристапност"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Физичка тастатура"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Игнорирај повторени притискања"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Тастатурата игнорира брзи притискања на истото копче што се повторуваат"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Праг на игнор. на повт. притискање"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Изберете го времетраењето кога вашата тастатура ги игнорира повторените притискања на копчињата"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2 сек."</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4 сек."</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0,6 сек."</string>
     <string name="slow_keys" msgid="2891452895499690837">"Бавни копчиња"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Го приспособува времето за да се активира притискање копче"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Лепливи копчиња"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Притискајте ги копчињата за кратенки едно по едно наместо да ги држите копчињата притиснати заедно"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Копчиња на глувчето"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Користете ја тастатурата за да го контролирате покажувачот"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Обратно лизгање на глувчето"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Лизгајте нагоре за да ја преместите страницата надолу"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Заменете ги местата на левото и десното копче"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Користете го левото копче на глувчето како десно"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Кратенки на тастатурата"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Прикажи список со кратенки"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Тастатури и алатки за работниот профил"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Изберете ново копче за <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Пристапност до физичка тастатура"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"лепливи копчиња, копчиња за игнорирање повторени притискања, копчиња на глувчето"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Распоред на <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Стандардно"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Преглед"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Стандардни опции"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Јазик"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Големина на титлови"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Стил на титловите"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Приспособени опции"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Боја на заднина"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Да се исклучи оваа VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Прекини врска"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Верзија"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Заборави VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Да се замени постојната VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Да се постави „секогаш вклучена“ VPN?"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Пребарувајте низ поставките"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"контакти, складирање, сметка"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Складирање контакти"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Само уред"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Новите контакти нема да се синхронизираат со сметка"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Контактите ќе се зачувуваат на вашиот уред и стандардно ќе се синхронизираат со вашата сметка"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Нема поставено стандардна сметка"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Додајте сметка за да започнете"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-ml/arrays.xml b/res/values-ml/arrays.xml
index bd20789..5fc8e3d 100644
--- a/res/values-ml/arrays.xml
+++ b/res/values-ml/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"ബ്രീഫ്കെയ്‌സ്"</item>
-    <item msgid="184985872234062767">"ക്ലാസിക്കൽ ബില്‍ഡിംഗ്"</item>
-    <item msgid="9189550412466785530">"അപ്പാർട്ട്മെന്റ് ബിൽഡിംഗ്"</item>
-    <item msgid="2142527562511049422">"സ്പീച്ച് ബബിൾ"</item>
-    <item msgid="2548100558260478605">"ആളുകളുടെ കൂട്ടം"</item>
-    <item msgid="2270003903304578284">"ലൈറ്റ്ബൾബ്"</item>
-    <item msgid="4793496619091161864">"കലണ്ടർ"</item>
-    <item msgid="5673625795644364100">"ശല്യപ്പെടുത്തരുത്"</item>
-    <item msgid="1423820834865831361">"ഓടുന്ന വ്യക്തി"</item>
-    <item msgid="2037298830718732608">"ഗോൾഫ്"</item>
-    <item msgid="2197835014443491074">"ജിം ഡംബെൽ"</item>
-    <item msgid="2730180105015616518">"നീന്തൽ"</item>
-    <item msgid="2666922823253345958">"ഹൈക്ക് ചെയ്യുന്ന വ്യക്തി"</item>
-    <item msgid="8234880356472211396">"പന്ത് എറിയുന്ന വ്യക്തി"</item>
-    <item msgid="4642980625253001443">"കിക്ക് ചെയ്യുന്ന വ്യക്തി"</item>
-    <item msgid="4324795269518833500">"ഗെയിം കൺട്രോളർ"</item>
-    <item msgid="7789966425125441125">"ആർട്ടിസ്റ്റിന്റെ വർണ്ണ പാലെറ്റ്"</item>
-    <item msgid="663512680597461570">"മഞ്ഞുകട്ട"</item>
-    <item msgid="7952183800501346803">"ബീച്ച് കുട"</item>
-    <item msgid="799139025758265891">"വർക്ക്‌ഷോപ്പ് ടൂളുകൾ"</item>
-    <item msgid="1330084588359129896">"ടെന്റ്"</item>
-    <item msgid="3861584909935022342">"ഫിലിം റീൽ"</item>
-    <item msgid="5827426100157335512">"പുസ്‌തകം"</item>
-    <item msgid="8585828346253128384">"താമരപ്പൂവ്"</item>
-    <item msgid="8788370542815300188">"മനസ്സ്"</item>
-    <item msgid="7287354964767553293">"ഹെഡ്‌ഫോണുകൾ"</item>
-    <item msgid="2530059623783800987">"ടിവി"</item>
-    <item msgid="5307182323469376758">"ട്രെയിൻ"</item>
-    <item msgid="4903790544026923026">"കാർ"</item>
-    <item msgid="5010405583912314582">"ഫോർക്കും കത്തിയും"</item>
-    <item msgid="8939998598599064900">"ഷോപ്പിംഗ് കാർട്ട്"</item>
-    <item msgid="3379605903308731893">"കുട്ടി"</item>
-    <item msgid="7808668968550293112">"മൃഗത്തിന്റെ കാൽപ്പാദം"</item>
-    <item msgid="1000692647524056504">"സ്റ്റാർ ബാഡ്‌ജ്"</item>
-    <item msgid="8270261073421676502">"രണ്ട് പേർ"</item>
-    <item msgid="5767782819651505460">"നക്ഷത്രം"</item>
-    <item msgid="4368451291862729334">"ഹൃദയം"</item>
-    <item msgid="2613199102208419986">"വീട്"</item>
-    <item msgid="3022279986430275040">"അർദ്ധ ചന്ദ്രൻ"</item>
-    <item msgid="5421089790869483206">"ക്ലോക്ക്"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 07c653a..904b5be 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"നിങ്ങളുടെ നെറ്റ്‌വർക്കും വയർലെസ് സിഗ്‌നലുകളും ഉപയോഗിച്ച് സ്വയമേവ സജ്ജീകരിക്കുക"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"സ്വയമേവ ഉള്ള സമയമേഖല"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"നിങ്ങളുടെ സമീപമുള്ള മൊബൈൽ നെറ്റ്‌വർക്കുകളുടെ അടിസ്ഥാനത്തിൽ സ്വയമേവ സജ്ജീകരിക്കുക"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"ലഭ്യമെങ്കിൽ, ഉപകരണ ലൊക്കേഷൻ ഉപയോഗിച്ച് സ്വയമേവ സജ്ജീകരിക്കുക. സജീവ വൈഫൈ കണക്ഷനും ആവശ്യമായേക്കാം."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"ഡിഫോൾട്ട് ഭാഷ ഉപയോഗിക്കുക"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-മണിക്കൂർ ഫോർമാറ്റ് ഉപയോഗിക്കുക"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"സമയം"</string>
@@ -1958,6 +1959,10 @@
     <string name="sticky_keys_summary" msgid="1844953803625480623">"കുറുക്കുവഴികൾക്കായി, കീകൾ ഒരുമിച്ച് അമർത്തിപ്പിടിക്കുന്നതിന് പകരം ഒരു സമയം ഒരു കീ അമർത്തുക"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"മൗസ് കീകൾ"</string>
     <string name="mouse_keys_summary" msgid="7030731235143286467">"പോയിന്റർ നിയന്ത്രിക്കാൻ നിങ്ങളുടെ കീബോർഡ് ഉപയോഗിക്കുക"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"മൗസ് വിപരീത ദിശയിൽ സ്‌ക്രോൾ ചെയ്യൽ"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"പേജ് താഴേക്ക് നീക്കാൻ മുകളിലേക്ക് സ്ക്രോൾ ചെയ്യുക"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"ഇടത്, വലത് ബട്ടണുകൾ സ്വാപ്പ് ചെയ്യുക"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"ഇടത് മൗസ് ബട്ടൺ വലത് ബട്ടണായി ഉപയോഗിക്കുക"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"കീബോഡ് കുറുക്കുവഴികൾ"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"കുറുക്കുവഴികളുടെ ലിസ്റ്റ് കാണിക്കുക"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"ഔദ്യോഗിക പ്രൊഫൈൽ കീബോർഡുകളും ടൂളുകളും"</string>
@@ -2026,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> എന്നതിനായി പുതിയ കീ തിരഞ്ഞെടുക്കൂ:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"ഫിസിക്കൽ കീബോർഡ് ഉപയോഗസഹായി"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"സ്റ്റിക്കി കീകൾ, ബൗൺസ് കീകൾ, മൗസ് കീകൾ"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> ലേഔട്ട്"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ഡിഫോൾട്ട്"</string>
@@ -2434,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"പ്രിവ്യൂ ചെയ്യുക"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"സാധാരണ ഓപ്ഷനുകൾ"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"ഭാഷ"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"സബ്‌ടൈറ്റിലിന്റെ വലുപ്പം"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"അടിക്കുറിപ്പ് സ്റ്റൈൽ"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"ഇഷ്‌ടാനുസൃത ഓപ്‌ഷനുകൾ"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"പശ്ചാത്തല വര്‍ണം"</string>
@@ -2979,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"ഈ VPN വിച്ഛേദിക്കണോ?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"വിച്ഛേദിക്കുക"</string>
     <string name="vpn_version" msgid="6344167191984400976">"പതിപ്പ്"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN മറക്കുക"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"നിലവിലുള്ള VPN-ന് പകരം പുതിയതാക്കണോ?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"\'എല്ലായ്പ്പോഴും ഓൺ\' VPN സജ്ജമാക്കണോ?"</string>
@@ -5459,4 +5469,8 @@
     <string name="contacts_storage_selection_message" msgid="8082077300632059003">"കോൺടാക്റ്റുകൾ നിങ്ങളുടെ ഉപകരണത്തിൽ സംരക്ഷിക്കുകയും ഡിഫോൾട്ടായി നിങ്ങളുടെ അക്കൗണ്ടിലേക്ക് സമന്വയിപ്പിക്കുകയും ചെയ്യും"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"ഡിഫോൾട്ട് ഒന്നും സജ്ജമാക്കിയിട്ടില്ല"</string>
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"ആരംഭിക്കുന്നതിന് ഒരു അക്കൗണ്ട് ചേർക്കുക"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
+    <skip />
 </resources>
diff --git a/res/values-mn/arrays.xml b/res/values-mn/arrays.xml
index d7083c8..e3a6807 100644
--- a/res/values-mn/arrays.xml
+++ b/res/values-mn/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Чемодан"</item>
-    <item msgid="184985872234062767">"Сонгодог барилга"</item>
-    <item msgid="9189550412466785530">"Орон сууцын барилга"</item>
-    <item msgid="2142527562511049422">"Ярианы тэмдэглэгээ"</item>
-    <item msgid="2548100558260478605">"Бүлэг хүмүүс"</item>
-    <item msgid="2270003903304578284">"Чийдэн"</item>
-    <item msgid="4793496619091161864">"Календарь"</item>
-    <item msgid="5673625795644364100">"Бүү саад бол"</item>
-    <item msgid="1423820834865831361">"Гүйж буй хүн"</item>
-    <item msgid="2037298830718732608">"Гольф"</item>
-    <item msgid="2197835014443491074">"Биеийн тамирын заалны гантель"</item>
-    <item msgid="2730180105015616518">"Усанд сэлэлт"</item>
-    <item msgid="2666922823253345958">"Явган аялж буй хүн"</item>
-    <item msgid="8234880356472211396">"Бөмбөг шидэж буй хүн"</item>
-    <item msgid="4642980625253001443">"Өшиглөж буй хүн"</item>
-    <item msgid="4324795269518833500">"Тоглоомын удирдлага"</item>
-    <item msgid="7789966425125441125">"Уран бүтээлчийн өнгөний нийлүүр"</item>
-    <item msgid="663512680597461570">"Цасан ширхэг"</item>
-    <item msgid="7952183800501346803">"Далайн эргийн шүхэр"</item>
-    <item msgid="799139025758265891">"Урлангийн багаж хэрэгсэл"</item>
-    <item msgid="1330084588359129896">"Майхан"</item>
-    <item msgid="3861584909935022342">"Зургийн хальс"</item>
-    <item msgid="5827426100157335512">"Ном"</item>
-    <item msgid="8585828346253128384">"Бадамлянхуа цэцэг"</item>
-    <item msgid="8788370542815300188">"Хүний оюун ухаан"</item>
-    <item msgid="7287354964767553293">"Чихэвч"</item>
-    <item msgid="2530059623783800987">"ТВ"</item>
-    <item msgid="5307182323469376758">"Галт тэрэг"</item>
-    <item msgid="4903790544026923026">"Машин"</item>
-    <item msgid="5010405583912314582">"Хутга, сэрээ"</item>
-    <item msgid="8939998598599064900">"Худалдан авалтын сагс"</item>
-    <item msgid="3379605903308731893">"Хүүхэд"</item>
-    <item msgid="7808668968550293112">"Амьтны сарвуу"</item>
-    <item msgid="1000692647524056504">"Одтой тэмдэг"</item>
-    <item msgid="8270261073421676502">"Хоёр хүн"</item>
-    <item msgid="5767782819651505460">"Од"</item>
-    <item msgid="4368451291862729334">"Зүрх"</item>
-    <item msgid="2613199102208419986">"Байшин"</item>
-    <item msgid="3022279986430275040">"Тал сар"</item>
-    <item msgid="5421089790869483206">"Цаг"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index a729377..aff1eda 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Таны сүлжээ болон утасгүй дохиог ашиглан автоматаар тохируулна"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Автомат цагийн бүс"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Таны ойролцоох хөдөлгөөнт холбооны сүлжээнд үндэслэн автоматаар тохируулна"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Таны төхөөрөмжийн байршлыг ашиглан автоматаар тохируулна. Идэвхтэй Wi-Fi холболт мөн шаардаж болно"</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Бүс нутгийн өгөгдмөлийг ашиглах"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24 цагийн формат ашиглах"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Цаг"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Хандалт"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Биет гар"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Ойх түлхүүрүүд"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Гар нэг товчийн давтагдсан шуурхай даралтыг үл хэрэгсэнэ"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Ойх товчийн босго"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Таны гар давтагдсан товчийн даралтыг үл хэрэгсэх хугацааг сонгоорой"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2 сек"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4 сек"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0,6 сек"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Удаан товчнууд"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Товчийн даралт идэвхжихэд зарцуулах хугацааг тохируулна"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Бэхэлсэн түлхүүрүүд"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Товчлолд товчлууруудыг хамтад нь удаан дарахын оронд нэг удаад нэг товчлуур дарна уу"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Хулганын товч"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Заагчийг хянахад гараа ашиглана уу"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Хулганыг урвуу гүйлгэх"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Хуудсыг доош зөөхийн тулд дээш гүйлгэнэ үү"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Зүүн, баруун товчнуудыг солих"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Хулганын зүүн товчийг баруун товчоороо ашиглана уу"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Гарын товчлол"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Товчлолын жагсаалтыг харуулах"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Ажлын профайлын гар &amp; хэрэгсэл"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>-н шинэ товч сонгоно уу:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Биет гарын хандалт"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Бэхэлсэн товч, буцаах товч, хулганын товч"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> бүдүүвч"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Өгөгдмөл"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Урьдчилж харах"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Стандарт сонголтууд"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Хэл"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Тайлбарын хэмжээ"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Тайлбарын загвар"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Тусгай сонголтууд"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Дэвсгэр өнгө"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Энэ VPN-г салгах уу?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Салгах"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Хувилбар"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN-г мартах"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Энэ VPN-г солих уу?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"VPN-г тогтмол асаалттайгаар тохируулах уу?"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Хайлтын тохиргоо"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"харилцагчид, хадгалах сан, бүртгэл"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Харилцагчдын хадгалах сан"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Зөвхөн төхөөрөмж"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Шинэ харилцагчдыг бүртгэлтэй синк хийхгүй"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Харилцагчдыг өгөгдмөлөөр таны төхөөрөмжид хадгалж, бүртгэлд тань синк хийнэ"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Өгөгдмөл бүртгэл тохируулаагүй"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Эхлүүлэхийн тулд бүртгэл нэмнэ үү"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-mr/arrays.xml b/res/values-mr/arrays.xml
index a6ff624..14ca732 100644
--- a/res/values-mr/arrays.xml
+++ b/res/values-mr/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"ब्रीफकेस"</item>
-    <item msgid="184985872234062767">"क्लासिकल इमारत"</item>
-    <item msgid="9189550412466785530">"अपार्टमेंट इमारत"</item>
-    <item msgid="2142527562511049422">"स्पीच बबल"</item>
-    <item msgid="2548100558260478605">"लोकांचा गट"</item>
-    <item msgid="2270003903304578284">"लाइटबल्ब"</item>
-    <item msgid="4793496619091161864">"कॅलेंडर"</item>
-    <item msgid="5673625795644364100">"व्यत्यय आणू नका"</item>
-    <item msgid="1423820834865831361">"धावणारी व्यक्ती"</item>
-    <item msgid="2037298830718732608">"गोल्फ"</item>
-    <item msgid="2197835014443491074">"व्यायामशाळेतील डंबेल"</item>
-    <item msgid="2730180105015616518">"पोहणे"</item>
-    <item msgid="2666922823253345958">"हायकिंग करत असलेली व्यक्ती"</item>
-    <item msgid="8234880356472211396">"बॉल फेकत असलेली व्यक्ती"</item>
-    <item msgid="4642980625253001443">"किक मारत असलेली व्यक्ती"</item>
-    <item msgid="4324795269518833500">"गेम कंट्रोलर"</item>
-    <item msgid="7789966425125441125">"कलाकाराकडील कलर पॅलेट"</item>
-    <item msgid="663512680597461570">"स्नोफ्लेक"</item>
-    <item msgid="7952183800501346803">"समुद्रकिनाऱ्यावर वापरली जाणारी छत्री"</item>
-    <item msgid="799139025758265891">"कारखान्यातील अवजारे"</item>
-    <item msgid="1330084588359129896">"तंबू"</item>
-    <item msgid="3861584909935022342">"फिल्म रील"</item>
-    <item msgid="5827426100157335512">"पुस्तक"</item>
-    <item msgid="8585828346253128384">"कमळाचे फूल"</item>
-    <item msgid="8788370542815300188">"व्यक्तीचे मन"</item>
-    <item msgid="7287354964767553293">"हेडफोन"</item>
-    <item msgid="2530059623783800987">"टीव्ही"</item>
-    <item msgid="5307182323469376758">"ट्रेन"</item>
-    <item msgid="4903790544026923026">"कार"</item>
-    <item msgid="5010405583912314582">"काटा आणि सुरी"</item>
-    <item msgid="8939998598599064900">"शॉपिंग कार्ट"</item>
-    <item msgid="3379605903308731893">"लहान मूल"</item>
-    <item msgid="7808668968550293112">"प्राण्याचा पंजा"</item>
-    <item msgid="1000692647524056504">"स्टार बॅज"</item>
-    <item msgid="8270261073421676502">"दोन लोक"</item>
-    <item msgid="5767782819651505460">"तारा"</item>
-    <item msgid="4368451291862729334">"हार्ट"</item>
-    <item msgid="2613199102208419986">"हाउस"</item>
-    <item msgid="3022279986430275040">"अर्धचंद्र"</item>
-    <item msgid="5421089790869483206">"घड्याळ"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index b32a4a1..75b31a2 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"तुमचे नेटवर्क आणि वायरलेस सिग्नल वापरून आपोआप सेट करा"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"ऑटोमॅटिक टाइम झोन"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"तुमच्या जवळपासच्या मोबाइल नेटवर्कच्या आधारे आपोआप सेट करा"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"उपलब्ध असल्यास, तुमचे डिव्हाइस स्थान वापरून आपोआप सेट करा. अ‍ॅक्टिव्ह वायफाय कनेक्शनदेखील आवश्यक असू शकते."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"लोकॅल डीफॉल्ट वापरा"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"२४ तास फॉरमॅट वापरा"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"वेळ"</string>
@@ -1958,6 +1959,10 @@
     <string name="sticky_keys_summary" msgid="1844953803625480623">"की एकत्र धरून ठेवण्याऐवजी शॉर्टकटसाठी एकावेळी एक की प्रेस करा"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"माउस की"</string>
     <string name="mouse_keys_summary" msgid="7030731235143286467">"पॉइंटर नियंत्रित करण्यासाठी तुमचा कीबोर्ड वापरा"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"माउस रिव्हर्स स्क्रोलिंग"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"पेज खाली हलवण्यासाठी वरती स्क्रोल करा"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"डावे व उजवे बटण स्वॅप करा"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"माऊसच्या डाव्या बटणाला तुमचे उजवे बटण म्हणून वापरा"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"कीबोर्ड शॉर्टकट"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"शॉर्टकटची सूची दाखवा"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"कार्य प्रोफाइल कीबोर्ड आणि टूल"</string>
@@ -2026,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> साठी नवीन की निवडा:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"वास्तविक कीबोर्ड अ‍ॅक्सेसिबिलिटी"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"स्टिकी की, बाउन्स की, माउस की"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> लेआउट"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"डीफॉल्ट"</string>
@@ -2434,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"पूर्वावलोकन"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"मानक पर्याय"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"भाषा"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"कॅप्शनचा आकार"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"कॅप्शन शैली"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"कस्टम पर्याय"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"बॅकग्राउंडचा रंग"</string>
@@ -2979,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"हे VPN डिस्कनेक्ट करायचे?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"‍डिस्कनेक्ट करा"</string>
     <string name="vpn_version" msgid="6344167191984400976">"आवृत्ती"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN विसरा"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"विद्यमान VPN पुनर्स्थित करायचे?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"नेहमी-सुरू VPN सेट करायचे?"</string>
@@ -5459,4 +5469,8 @@
     <string name="contacts_storage_selection_message" msgid="8082077300632059003">"संपर्क हे तुमच्या डिव्हाइसमध्ये सेव्ह केले जातील आणि बाय डीफॉल्ट तुमच्या खात्यामध्ये सिंक केले जातील"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"कोणतेही डीफॉल्ट अकाउंट सेट केलेले नाही"</string>
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"सुरू करण्यासाठी एखादे खाते जोडा"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
+    <skip />
 </resources>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
index 11c4761..5d03f09 100644
--- a/res/values-ms/arrays.xml
+++ b/res/values-ms/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Beg bimbit"</item>
-    <item msgid="184985872234062767">"Bangunan klasik"</item>
-    <item msgid="9189550412466785530">"Bangunan pangsapuri"</item>
-    <item msgid="2142527562511049422">"Gelembung pertuturan"</item>
-    <item msgid="2548100558260478605">"Kumpulan orang"</item>
-    <item msgid="2270003903304578284">"Mentol lampu"</item>
-    <item msgid="4793496619091161864">"Kalendar"</item>
-    <item msgid="5673625795644364100">"Jangan Ganggu"</item>
-    <item msgid="1423820834865831361">"Orang sedang berlari"</item>
-    <item msgid="2037298830718732608">"Golf"</item>
-    <item msgid="2197835014443491074">"Dumbel gim"</item>
-    <item msgid="2730180105015616518">"Berenang"</item>
-    <item msgid="2666922823253345958">"Orang mengembara berjalan kaki"</item>
-    <item msgid="8234880356472211396">"Orang membaling bola"</item>
-    <item msgid="4642980625253001443">"Orang menendang"</item>
-    <item msgid="4324795269518833500">"Pengawal permainan"</item>
-    <item msgid="7789966425125441125">"Palet warna pelukis"</item>
-    <item msgid="663512680597461570">"Emping salji"</item>
-    <item msgid="7952183800501346803">"Payung pantai"</item>
-    <item msgid="799139025758265891">"Alatan bengkel"</item>
-    <item msgid="1330084588359129896">"Khemah"</item>
-    <item msgid="3861584909935022342">"Gelendong filem"</item>
-    <item msgid="5827426100157335512">"Buku"</item>
-    <item msgid="8585828346253128384">"Bunga teratai"</item>
-    <item msgid="8788370542815300188">"Minda seseorang"</item>
-    <item msgid="7287354964767553293">"Fon kepala"</item>
-    <item msgid="2530059623783800987">"TV"</item>
-    <item msgid="5307182323469376758">"Kereta api"</item>
-    <item msgid="4903790544026923026">"Kereta"</item>
-    <item msgid="5010405583912314582">"Garpu dan pisau"</item>
-    <item msgid="8939998598599064900">"Troli beli-belah"</item>
-    <item msgid="3379605903308731893">"Anak"</item>
-    <item msgid="7808668968550293112">"Tapak kaki haiwan"</item>
-    <item msgid="1000692647524056504">"Lencana bintang"</item>
-    <item msgid="8270261073421676502">"Dua orang"</item>
-    <item msgid="5767782819651505460">"Bintang"</item>
-    <item msgid="4368451291862729334">"Hati"</item>
-    <item msgid="2613199102208419986">"Rumah"</item>
-    <item msgid="3022279986430275040">"Bulan separa"</item>
-    <item msgid="5421089790869483206">"Jam"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index f6ef310..e57fa19 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Tetapkan secara automatik menggunakan isyarat rangkaian dan wayarles anda"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Zon waktu automatik"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Tetapkan secara automatik berdasarkan rangkaian mudah alih berdekatan anda"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Tetapan automatik dengan lokasi peranti, jika tersedia. Sambungan Wi-Fi aktif mungkin diperlukan."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Gunakan tetapan lalai tempat peristiwa"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Gunakan format 24 jam"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Masa"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Kebolehaksesan"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Papan kekunci fizikal"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Kekunci lantun"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Papan kekunci mengabaikan tekanan kekunci yang sama secara berulang"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Ambang kekunci lantun"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Pilih tempoh masa papan kekunci anda mengabaikan tekanan kekunci yang berulang"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0.2s"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0.4s"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0.6s"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Kekunci perlahan"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Laraskan masa yang diambil untuk mengaktifkan tekanan kekunci"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Kekunci Lekit"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Tekan satu kekunci pada satu-satu masa untuk pintasan, bukan menahan beberapa kekunci secara serentak"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Kekunci tetikus"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Gunakan papan kekunci anda untuk mengawal penuding"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Penatalan terbalik tetikus"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Tatal ke atas untuk menggerakkan halaman ke bawah"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Tukar butang kiri ke kanan dan kanan ke kiri"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Gunakan butang tetikus kiri sebagai klik kanan anda"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Pintasan papan kekunci"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Tunjukkan senarai pintasan"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Papan kekunci &amp; alatan profil kerja"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Pilih kunci baharu untuk <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Kebolehaksesan papan kekunci fizikal"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Kekunci lekit, Kekunci lantun, Kekunci tetikus"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Reka letak <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Lalai"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Pratonton"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Pilihan standard"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Bahasa"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Saiz sari kata"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Gaya sari kata"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Pilihan tersuai"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Warna latar belakang"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Putuskan sambungan VPN ini?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Putuskan sambungan"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versi"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Lupakan VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Gantikan VPN yang sedia ada?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Tetapkan VPN sentiasa hidup?"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Carian Tetapan"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"kenalan, storan, akaun"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Storan kenalan"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Peranti sahaja"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Kenalan baharu tidak akan disegerakkan dengan akaun"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kenalan akan disimpan pada peranti anda dan disegerakkan kepada akaun anda secara lalai"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Tiada akaun lalai ditetapkan"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Tambahkan akaun untuk bermula"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-my/arrays.xml b/res/values-my/arrays.xml
index e7aeef7..fc7a275 100644
--- a/res/values-my/arrays.xml
+++ b/res/values-my/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"ရုံးသုံးလက်ဆွဲအိတ်"</item>
-    <item msgid="184985872234062767">"ရှေးဟောင်း အဆောက်အအုံ"</item>
-    <item msgid="9189550412466785530">"တိုက်ခန်း"</item>
-    <item msgid="2142527562511049422">"စကားပြော ပူဖောင်းကွက်"</item>
-    <item msgid="2548100558260478605">"လူအုပ်စု"</item>
-    <item msgid="2270003903304578284">"မီးလုံး"</item>
-    <item msgid="4793496619091161864">"ပြက္ခဒိန်"</item>
-    <item msgid="5673625795644364100">"မနှောင့်ယှက်ရ"</item>
-    <item msgid="1423820834865831361">"ပြေးနေသူ"</item>
-    <item msgid="2037298830718732608">"ဂေါက်ရိုက်ခြင်း"</item>
-    <item msgid="2197835014443491074">"အားကစားရုံ ဝိတ်တုံး"</item>
-    <item msgid="2730180105015616518">"ရေကူးခြင်း"</item>
-    <item msgid="2666922823253345958">"တောင်တက်နေသူ"</item>
-    <item msgid="8234880356472211396">"ဘောလုံးပစ်နေသူ"</item>
-    <item msgid="4642980625253001443">"ကန်နေသူ"</item>
-    <item msgid="4324795269518833500">"ဂိမ်းထိန်းချုပ်ကိရိယာ"</item>
-    <item msgid="7789966425125441125">"ပန်းချီပညာရှင် အရောင်အစုအဖွဲ့"</item>
-    <item msgid="663512680597461570">"နှင်းပွင့်"</item>
-    <item msgid="7952183800501346803">"ကမ်းခြေထီး"</item>
-    <item msgid="799139025758265891">"အလုပ်ရုံတူးလ်များ"</item>
-    <item msgid="1330084588359129896">"တဲ"</item>
-    <item msgid="3861584909935022342">"ဖလင်လိပ်"</item>
-    <item msgid="5827426100157335512">"စာအုပ်"</item>
-    <item msgid="8585828346253128384">"ကြာပန်း"</item>
-    <item msgid="8788370542815300188">"လူ့စိတ်"</item>
-    <item msgid="7287354964767553293">"နားကြပ်"</item>
-    <item msgid="2530059623783800987">"TV"</item>
-    <item msgid="5307182323469376758">"ရထား"</item>
-    <item msgid="4903790544026923026">"ကား"</item>
-    <item msgid="5010405583912314582">"ဓား၊ ခက်ရင်း"</item>
-    <item msgid="8939998598599064900">"ဈေးခြင်းတောင်း"</item>
-    <item msgid="3379605903308731893">"ကလေး"</item>
-    <item msgid="7808668968550293112">"တိရစ္ဆာန်ဖဝါး"</item>
-    <item msgid="1000692647524056504">"ကြယ်ပွင့်တံဆိပ်"</item>
-    <item msgid="8270261073421676502">"လူနှစ်ဦး"</item>
-    <item msgid="5767782819651505460">"ကြယ်"</item>
-    <item msgid="4368451291862729334">"အသည်းပုံ"</item>
-    <item msgid="2613199102208419986">"အိမ်"</item>
-    <item msgid="3022279986430275040">"လခြမ်းတစ်ဝက်"</item>
-    <item msgid="5421089790869483206">"နာရီ"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 5a0a6d1..b0301a1 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"သင့်ကွန်ရက်နှင့် ကြိုးမဲ့အချက်ပြမှုများသုံး၍ အလိုအလျောက်သတ်မှတ်သည်"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"အလိုအလျောက် ဒေသစံတော်ချိန်"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"သင့်အနီးရှိ မိုဘိုင်းကွန်ရက်များပေါ် အခြေခံ၍ အလိုအလျောက်သတ်မှတ်သည်"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"ရနိုင်ပါက သင့်စက်တည်နေရာသုံး၍ အလိုအလျောက်သတ်မှတ်သည်။ ပွင့်နေသော Wifi ချိတ်ဆက်မှုလည်း လိုအပ်နိုင်သည်။"</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"ဒေသ၏ ဘာသာစကားစနစ်ကို သုံးရန်"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"၂၄-နာရီပုံစံကို အသုံးပြုရန်"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"အချိန်"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"အများသုံးနိုင်မှု"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"စက်၏ ကီးဘုတ်"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"ပြန်ကန်ကီးများ"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"ကီးဘုတ်သည် ကီးတစ်ခုတည်း အကြိမ်ကြိမ် အမြန်နှိပ်ခြင်းကို လျစ်လျူရှုသည်"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"ကြိမ်ထပ်နှိပ်ခြင်းများ သတ်မှတ်ချက်"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"ကီးအကြိမ်ကြိမ်နှိပ်ခြင်းကို ကီးဘုတ်က လျစ်လျူရှုမည့်ကြာချိန် ရွေးပါ"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"၀.၂ စက္ကန့်"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"၀.၄ စက္ကန့်"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"၀.၆ စက္ကန့်"</string>
     <string name="slow_keys" msgid="2891452895499690837">"အနှေးကီးများ"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"ဖွင့်ရန် ကီးနှိပ်ခြင်းအတွက် ကြာချိန်ကို ပြင်ပေးသည်"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"ကပ်ခွာကီးများ"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"ဖြတ်လမ်းလင့်ခ်များအတွက် ခလုတ်များကို တစ်ပြိုင်တည်းဖိထားမည့်အစား တစ်ကြိမ်လျှင် ခလုတ်တစ်ခု နှိပ်နိုင်သည်"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"မောက်စ်ကီးများ"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"ညွှန်မှတ် ထိန်းချုပ်ရန် သင့်ကီးဘုတ်ကို သုံးပါ"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"မောက်စ်ပြောင်းပြန်လှိမ့်ခြင်း"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"စာမျက်နှာအောက်သို့ ရွှေ့ရန်အတွက် အပေါ်သို့လှိမ့်ပါ"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"ဘယ်နှင့်ညာခလုတ်များ ပြောင်းရန်"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"ဘယ်ဘက်မောက်စ်ခလုတ်ကို ညာဘက်ခလုတ်အဖြစ် သုံးနိုင်သည်"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"လက်ကွက်ဖြတ်လမ်းများ"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"ဖြတ်လမ်းလင့်ခ်များစာရင်း ပြပါ"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"အလုပ်ပရိုဖိုင် လက်ကွက်နှင့် တူးလ်များ"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> အတွက် ကီးအသစ်ရွေးပါ-"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"ပကတိကီးဘုတ် အများသုံးနိုင်မှု"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"ကပ်ခွာကီး၊ တစ်ကြိမ်နှိပ်ကီး၊ မောက်စ်ကီး"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> အပြင်အဆင်"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"မူရင်း"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"အစမ်းကြည့်ရှုရန်"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"ပုံမှန်ရွေးချယ်စရာများ"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"ဘာသာစကား"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"စာတန်းအရွယ်အစား"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"စာတန်းပုံစံ"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"စိတ်ကြိုက်ရွေးချယ်စရာများ"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"နောက်ခံအရောင်"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"ဤ VPN အား ချိတ်ဆက်မှု ဖြုတ်လိုပါသလား။"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"ဆက်သွယ်မှု ဖြတ်ရန်"</string>
     <string name="vpn_version" msgid="6344167191984400976">"ဗားရှင်း"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN ကိုမေ့လိုက်ပါ"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"ရှိပြီးသား VPN ကိုအစားထိုးမလား။"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"VPN ကို အမြဲတမ်းဖွင့်ထားရန် သတ်မှတ်မလား။"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"ဆက်တင်များတွင် ရှာရန်"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"အဆက်အသွယ်များ၊ သိုလှောင်ခန်း၊ အကောင့်"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"အဆက်အသွယ်များ သိုလှောင်ခန်း"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"စက်ပစ္စည်းသီးသန့်"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"အဆက်အသွယ်အသစ်များကို အကောင့်နှင့် စင့်ခ်လုပ်မည်မဟုတ်ပါ"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"မူရင်းသတ်မှတ်ချက်အရ အဆက်အသွယ်များကို သင့်စက်တွင်သိမ်းပြီး အကောင့်နှင့် စင့်ခ်လုပ်ပါမည်"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"ပုံသေ သတ်မှတ်မထားပါ"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"စတင်ရန် အကောင့်ထည့်ပါ"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 3f45262..cc9ee79 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Koffert"</item>
-    <item msgid="184985872234062767">"Klassisk bygning"</item>
-    <item msgid="9189550412466785530">"Boligblokk"</item>
-    <item msgid="2142527562511049422">"Snakkeboble"</item>
-    <item msgid="2548100558260478605">"Gruppe mennesker"</item>
-    <item msgid="2270003903304578284">"Lyspære"</item>
-    <item msgid="4793496619091161864">"Kalender"</item>
-    <item msgid="5673625795644364100">"Ikke forstyrr"</item>
-    <item msgid="1423820834865831361">"Person som løper"</item>
-    <item msgid="2037298830718732608">"Golf"</item>
-    <item msgid="2197835014443491074">"Håndvekt"</item>
-    <item msgid="2730180105015616518">"Svømming"</item>
-    <item msgid="2666922823253345958">"Person som går tur"</item>
-    <item msgid="8234880356472211396">"Person som kaster en ball"</item>
-    <item msgid="4642980625253001443">"Person som sparker"</item>
-    <item msgid="4324795269518833500">"Spillkontroller"</item>
-    <item msgid="7789966425125441125">"Kunstnerfargepalett"</item>
-    <item msgid="663512680597461570">"Snøflak"</item>
-    <item msgid="7952183800501346803">"Strandparasoll"</item>
-    <item msgid="799139025758265891">"Verktøy på verksted"</item>
-    <item msgid="1330084588359129896">"Telt"</item>
-    <item msgid="3861584909935022342">"Filmspole"</item>
-    <item msgid="5827426100157335512">"Bok"</item>
-    <item msgid="8585828346253128384">"Lotusblomst"</item>
-    <item msgid="8788370542815300188">"Sinnet til en person"</item>
-    <item msgid="7287354964767553293">"Hodetelefoner"</item>
-    <item msgid="2530059623783800987">"TV"</item>
-    <item msgid="5307182323469376758">"Tog"</item>
-    <item msgid="4903790544026923026">"Bil"</item>
-    <item msgid="5010405583912314582">"Kniv og gaffel"</item>
-    <item msgid="8939998598599064900">"Handlekurv"</item>
-    <item msgid="3379605903308731893">"Barn"</item>
-    <item msgid="7808668968550293112">"Dyrepote"</item>
-    <item msgid="1000692647524056504">"Stjernemerke"</item>
-    <item msgid="8270261073421676502">"To personer"</item>
-    <item msgid="5767782819651505460">"Stjerne"</item>
-    <item msgid="4368451291862729334">"Hjerte"</item>
-    <item msgid="2613199102208419986">"Hus"</item>
-    <item msgid="3022279986430275040">"Halvmåne"</item>
-    <item msgid="5421089790869483206">"Klokke"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index d501ad2..77c2884 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Angi automatisk med nettverket og trådløse signaler"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Automatisk tidssone"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Angi automatisk basert på mobilnettverk i nærheten"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Angi automatisk med enhetsposisjonen, hvis tilgjengelig. Aktiv wifi er kanskje også nødvendig."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Bruk lokal standard"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Bruk 24-timers format"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Tid"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Tilgjengelighet"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Fysisk tastatur"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Filtertaster"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Tastaturet ignorerer raskt gjentatte trykk på samme tast"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Grense for filtertaster"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Velg hvor lenge tastaturet skal ignorere gjentatte tastetrykk"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2 s"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4 s"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0,6 s"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Hengende taster"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Justerer tiden det tar før tastetrykk aktiveres"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Trege taster"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Aktiver hurtigtaster ved å trykke på én tast av gangen i stedet for å holde flere taster inne samtidig"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Museknapper"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Bruk tastaturet til å kontrollere pekeren"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Omvendt rulling med musen"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Rull opp for å flytte siden ned"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Bytt om på venstre og høyre knapp"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Bruk venstre museknapp som høyre"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Hurtigtaster"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Vis listen over hurtigtaster"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Tastatur og verktøy i jobbprofilen"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Velg en ny tast for <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Tilgjengelighet med fysisk tastatur"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Trege taster, filtertaster, musetaster"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g>-oppsett"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Standard"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Forhåndsvisning"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standardvalg"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Språk"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Tekststørrelse"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Tekststil"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Tilpassede alternativer"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Bakgrunnsfarge"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Vil du koble fra dette VPN-et?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Koble fra"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versjon"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Glem VPN-profilen"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Vil du erstatte det nåværende VPN-et?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Vil du angi alltid på-VPN?"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Søk i innstillingene"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"kontakter, lagring, konto"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Kontaktlager"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Bare enheten"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Nye kontakter synkroniseres ikke med kontoer"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kontakter lagres på enheten og synkroniseres med kontoen din som standard"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Ingen standard er valgt"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Legg til en konto for å komme i gang"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-ne/arrays.xml b/res/values-ne/arrays.xml
index 2249545..1895366 100644
--- a/res/values-ne/arrays.xml
+++ b/res/values-ne/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"ब्रिफकेस"</item>
-    <item msgid="184985872234062767">"पुरानो शैलीको भवन"</item>
-    <item msgid="9189550412466785530">"अपार्टमेन्ट भवन"</item>
-    <item msgid="2142527562511049422">"स्पिच बबल"</item>
-    <item msgid="2548100558260478605">"मान्छेहरूको समूह"</item>
-    <item msgid="2270003903304578284">"लाइटबल्ब"</item>
-    <item msgid="4793496619091161864">"पात्रो"</item>
-    <item msgid="5673625795644364100">"Do Not Disturb"</item>
-    <item msgid="1423820834865831361">"दौडिरहेको व्यक्ति"</item>
-    <item msgid="2037298830718732608">"गल्फ"</item>
-    <item msgid="2197835014443491074">"व्यायामशालामा प्रयोग गरिने डम्बेल"</item>
-    <item msgid="2730180105015616518">"पौडी"</item>
-    <item msgid="2666922823253345958">"पदयात्रा गरिरहेको व्यक्ति"</item>
-    <item msgid="8234880356472211396">"बल फ्याँकिरहेको व्यक्ति"</item>
-    <item msgid="4642980625253001443">"किक हानिरहेको व्यक्ति"</item>
-    <item msgid="4324795269518833500">"गेम कन्ट्रोलर"</item>
-    <item msgid="7789966425125441125">"आर्टिस्ट कलर प्यालेट"</item>
-    <item msgid="663512680597461570">"हिमकण"</item>
-    <item msgid="7952183800501346803">"समुद्री तटमा प्रयोग गरिने छाता"</item>
-    <item msgid="799139025758265891">"वर्कसप प्रयोग गरिने औजारहरू"</item>
-    <item msgid="1330084588359129896">"पाल"</item>
-    <item msgid="3861584909935022342">"फिल्म रिल"</item>
-    <item msgid="5827426100157335512">"पुस्तक"</item>
-    <item msgid="8585828346253128384">"कमल फूल"</item>
-    <item msgid="8788370542815300188">"व्यक्तिको दिमाग"</item>
-    <item msgid="7287354964767553293">"हेडफोन"</item>
-    <item msgid="2530059623783800987">"टिभी"</item>
-    <item msgid="5307182323469376758">"रेल"</item>
-    <item msgid="4903790544026923026">"कार"</item>
-    <item msgid="5010405583912314582">"काँटा र चक्कु"</item>
-    <item msgid="8939998598599064900">"सपिङ कार्ट"</item>
-    <item msgid="3379605903308731893">"बच्चा"</item>
-    <item msgid="7808668968550293112">"जनावरको पन्जा"</item>
-    <item msgid="1000692647524056504">"स्टार ब्याज"</item>
-    <item msgid="8270261073421676502">"दुई जना मान्छे"</item>
-    <item msgid="5767782819651505460">"तारा"</item>
-    <item msgid="4368451291862729334">"मुटु"</item>
-    <item msgid="2613199102208419986">"घर"</item>
-    <item msgid="3022279986430275040">"अर्धचन्द्र"</item>
-    <item msgid="5421089790869483206">"घडी"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 37ac582..790807d 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"तपाईंको नेटवर्क र वायरलेस सिग्नल प्रयोग गरेर मिति र समय स्वतः सेट गर्नुहोस्"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"स्वचालित प्रामाणिक समय"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"तपाईंको नजिकै भएका मोबाइल नेटवर्कका आधारमा मिति र समय स्वतः सेट गर्नुहोस्"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"उपलब्ध भएमा आफ्नो डिभाइसको लोकेसन प्रयोग गरेर मिति र समय स्वतः सेट गर्नुहोस्। सक्रिय Wi-Fi कनेक्सन पनि चाहिन सक्छ।"</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"लोकेलको डिफल्ट सेटिङ प्रयोग गर्नुहोस्"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"२४-घण्टे ढाँचा प्रयोग गर्नुहोस्"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"समय"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"एक्सेसिबिलिटी सुविधा"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"फिजिकल किबोर्ड"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"बाउन्स की"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"एउटै की बारम्बार थिच्दा किबोर्डले तुरुन्तै बेवास्ता गर्छ"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"बाउन्स कीको सीमा"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"कति समयसम्म बारम्बार की थिच्दा किबोर्डले बेवास्ता गर्छ भन्ने कुरा छनौट गर्नुहोस्"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"०.२ सेकेन्ड"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"०.४ सेकेन्ड"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"०.६ सेकेन्ड"</string>
     <string name="slow_keys" msgid="2891452895499690837">"स्लो की"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"कुनै की कति समयसम्म थिच्दा एक्टिभेट हुन्छ भन्ने कुरा मिलाउँछ"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"स्टिकी की"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"सर्टकट प्राप्त गर्नका लागि कीहरू सँगै थिचिराख्नुको साटो एक पटकमा एउटा की थिच्नुहोस्"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"माउस की"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"पोइन्टर नियन्त्रण गर्न किबोर्ड प्रयोग गर्नुहोस्"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"माउसको विपरीत दिशामा स्क्रोल गर्ने विकल्प"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"पेज सारेर तल लैजान माथितिर स्क्रोल गर्नुहोस्"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"दायाँ र बायाँ बटन अदलबदल गर्नुहोस्"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"माउसको बायाँपट्टिको बटनलाई दायाँ बटनका रूपमा प्रयोग गर्नुहोस्"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"किबोर्डका सर्टकटहरू"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"सर्टकटहरूको सूची देखाउनुहोस्"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"कार्य प्रोफाइल किबोर्ड र उपकरणहरू"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> को नयाँ की छनौट गर्नुहोस्:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"भौतिक किबोर्डको सर्वसुलभता"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"स्टिकी कीहरू, बाउन्स कीहरू, माउस कीहरू"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> लेआउट"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"डिफल्ट"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"पूर्वावलोकन"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"डिफल्ट विकल्पहरू"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"भाषा"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"क्याप्सनको आकार"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"क्याप्सनको शैली"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">" कस्टम विकल्प"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"पृष्ठभूमि रङ्ग"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"यो VPN को जडान विच्छेद गर्ने हो?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"डिस्कनेक्ट गर्नुहोस्"</string>
     <string name="vpn_version" msgid="6344167191984400976">"संस्करण"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN लाई बिर्सनुहोस्"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"विद्यमान VPN लाई बदल्ने हो?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"सधैँ-सक्रिय VPN लाई सेट गर्ने हो?"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"सेटिङ खोज्नुहोस्"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"कन्ट्याक्ट, भण्डारण, खाता"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"कन्ट्याक्टहरूको भण्डारण"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"डिभाइस मात्र"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"नयाँ कन्ट्याक्टहरू खातासँग सिंक गरिने छैनन्"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"डिफल्ट सेटिङअनुसार कन्ट्याक्टहरू तपाईंको डिभाइसमा सेभ गरिने छन् र तपाईंको खातामा सिंक गरिने छन्"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"कुनै डिफल्ट खाता सेट गरिएको छैन"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"सुरु गर्न खाता हाल्नुहोस्"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index b8e9c78..ee8fae9 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Koffertje"</item>
-    <item msgid="184985872234062767">"Klassiek gebouw"</item>
-    <item msgid="9189550412466785530">"Flat"</item>
-    <item msgid="2142527562511049422">"Tekstballon"</item>
-    <item msgid="2548100558260478605">"Groep mensen"</item>
-    <item msgid="2270003903304578284">"Gloeilamp"</item>
-    <item msgid="4793496619091161864">"Agenda"</item>
-    <item msgid="5673625795644364100">"Niet storen"</item>
-    <item msgid="1423820834865831361">"Persoon die rent"</item>
-    <item msgid="2037298830718732608">"Golf"</item>
-    <item msgid="2197835014443491074">"Dumbbell"</item>
-    <item msgid="2730180105015616518">"Zwemmen"</item>
-    <item msgid="2666922823253345958">"Persoon die wandelt"</item>
-    <item msgid="8234880356472211396">"Persoon die een bal gooit"</item>
-    <item msgid="4642980625253001443">"Persoon die schopt"</item>
-    <item msgid="4324795269518833500">"Gamecontroller"</item>
-    <item msgid="7789966425125441125">"Kleurenpalet van kunstenaar"</item>
-    <item msgid="663512680597461570">"Sneeuwvlok"</item>
-    <item msgid="7952183800501346803">"Parasol"</item>
-    <item msgid="799139025758265891">"Werkplaatsgereedschap"</item>
-    <item msgid="1330084588359129896">"Tent"</item>
-    <item msgid="3861584909935022342">"Filmrol"</item>
-    <item msgid="5827426100157335512">"Boek"</item>
-    <item msgid="8585828346253128384">"Lotusbloem"</item>
-    <item msgid="8788370542815300188">"Iemands gedachten"</item>
-    <item msgid="7287354964767553293">"Koptelefoon"</item>
-    <item msgid="2530059623783800987">"Tv"</item>
-    <item msgid="5307182323469376758">"Trein"</item>
-    <item msgid="4903790544026923026">"Auto"</item>
-    <item msgid="5010405583912314582">"Vork en mes"</item>
-    <item msgid="8939998598599064900">"Winkelwagentje"</item>
-    <item msgid="3379605903308731893">"Kind"</item>
-    <item msgid="7808668968550293112">"Dierenpoot"</item>
-    <item msgid="1000692647524056504">"Sterbadge"</item>
-    <item msgid="8270261073421676502">"2 mensen"</item>
-    <item msgid="5767782819651505460">"Ster"</item>
-    <item msgid="4368451291862729334">"Hartje"</item>
-    <item msgid="2613199102208419986">"Huis"</item>
-    <item msgid="3022279986430275040">"Halvemaan"</item>
-    <item msgid="5421089790869483206">"Klok"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index c70d0ca..ba71fc5 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Automatisch instellen met je netwerk- en draadloze signalen"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Automatische tijdzone"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Automatisch instellen op basis van mobiele netwerken bij jou in de buurt"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Automatisch instellen met apparaatlocatie, indien beschikbaar. Soms is ook een actieve wifi-verbinding vereist."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Standaardinstelling voor land gebruiken"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-uurs klok gebruiken"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Tijd"</string>
@@ -1958,6 +1959,10 @@
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Druk toetsen één voor één in voor snelkoppelingen in plaats van meerdere toetsen tegelijkertijd"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Muisknoppen"</string>
     <string name="mouse_keys_summary" msgid="7030731235143286467">"Gebruik je toetsenbord om de cursor te bedienen"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Omgekeerd scrollen met muis"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Scroll omhoog om de pagina omlaag te verplaatsen"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Knoppen links en rechts omwisselen"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Gebruik de linkermuisknop als je rechtermuisknop"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Sneltoetsen"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Toon lijst met sneltoetsen"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Toetsenborden en tools van werkprofiel"</string>
@@ -2026,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Kies een nieuwe toets voor <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Toegankelijkheid met fysiek toetsenbord"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Plaktoetsen, bouncetoetsen, muisknoppen"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Indeling: <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Standaard"</string>
@@ -2434,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Voorbeeld"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standaardopties"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Taal"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Grootte van ondertiteling"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Ondertitelstijl"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Aangepaste opties"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Achtergrondkleur"</string>
@@ -2979,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Verbinding met dit VPN verbreken?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Verbinding verbreken"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versie"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN vergeten"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Bestaande VPN vervangen?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Always-on VPN instellen?"</string>
@@ -5459,4 +5469,8 @@
     <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Contacten worden standaard opgeslagen op je apparaat en gesynchroniseerd met je account"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Geen standaard ingesteld"</string>
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Voeg een account toe om aan de slag te gaan"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
+    <skip />
 </resources>
diff --git a/res/values-or/arrays.xml b/res/values-or/arrays.xml
index 133c6cf..5266c7a 100644
--- a/res/values-or/arrays.xml
+++ b/res/values-or/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"ବ୍ରିଫକେସ"</item>
-    <item msgid="184985872234062767">"କ୍ଲାସିକାଲ ବିଲ୍ଡିଂ"</item>
-    <item msgid="9189550412466785530">"ଆପାର୍ଟମେଣ୍ଟ ବିଲ୍ଡିଂ"</item>
-    <item msgid="2142527562511049422">"ସ୍ପିଚ ବବଲ"</item>
-    <item msgid="2548100558260478605">"ଲୋକଙ୍କ ଗୋଷ୍ଠୀ"</item>
-    <item msgid="2270003903304578284">"ଲାଇଟବଲ୍ବ"</item>
-    <item msgid="4793496619091161864">"କେଲେଣ୍ଡର"</item>
-    <item msgid="5673625795644364100">"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ"</item>
-    <item msgid="1423820834865831361">"ଦୌଡ଼ୁଥିବା ବ୍ୟକ୍ତି"</item>
-    <item msgid="2037298830718732608">"ଗଲ୍ଫ"</item>
-    <item msgid="2197835014443491074">"ଜିମ ଡମ୍ବେଲ"</item>
-    <item msgid="2730180105015616518">"ସୁଇମିଂ"</item>
-    <item msgid="2666922823253345958">"ହାଇକିଂ କରୁଥିବା ବ୍ୟକ୍ତି"</item>
-    <item msgid="8234880356472211396">"ବଲ ଫିଙ୍ଗୁଥିବା ବ୍ୟକ୍ତି"</item>
-    <item msgid="4642980625253001443">"କିକ ମାରୁଥିବା ବ୍ୟକ୍ତି"</item>
-    <item msgid="4324795269518833500">"ଗେମ କଣ୍ଟ୍ରୋଲର"</item>
-    <item msgid="7789966425125441125">"କଳାକାରଙ୍କ ରଙ୍ଗ ପେଲେଟ"</item>
-    <item msgid="663512680597461570">"ସ୍ନୋଫ୍ଲେକ"</item>
-    <item msgid="7952183800501346803">"ବେଳାଭୂମିରେ ଛତା"</item>
-    <item msgid="799139025758265891">"ୱାର୍କସପ ଟୁଲ"</item>
-    <item msgid="1330084588359129896">"ଟେଣ୍ଟ"</item>
-    <item msgid="3861584909935022342">"ଫିଲ୍ମ ରିଲ"</item>
-    <item msgid="5827426100157335512">"ବହି"</item>
-    <item msgid="8585828346253128384">"ପଦ୍ମ ଫୁଲ"</item>
-    <item msgid="8788370542815300188">"ବ୍ୟକ୍ତିଙ୍କ ମନ"</item>
-    <item msgid="7287354964767553293">"ହେଡଫୋନଗୁଡ଼ିକ"</item>
-    <item msgid="2530059623783800987">"ଟିଭି"</item>
-    <item msgid="5307182323469376758">"ଟ୍ରେନ"</item>
-    <item msgid="4903790544026923026">"କାର"</item>
-    <item msgid="5010405583912314582">"କଣ୍ଟା ଓ ଛୁରୀ"</item>
-    <item msgid="8939998598599064900">"ସପିଂ କାର୍ଟ"</item>
-    <item msgid="3379605903308731893">"ପିଲା"</item>
-    <item msgid="7808668968550293112">"ପଶୁର ପଞ୍ଜା"</item>
-    <item msgid="1000692647524056504">"ଷ୍ଟାର ବେଜ"</item>
-    <item msgid="8270261073421676502">"ଦୁଇ ଜଣ ଲୋକ"</item>
-    <item msgid="5767782819651505460">"ଷ୍ଟାର"</item>
-    <item msgid="4368451291862729334">"ହାର୍ଟ"</item>
-    <item msgid="2613199102208419986">"ଘର"</item>
-    <item msgid="3022279986430275040">"ଅର୍ଦ୍ଧ-ଚନ୍ଦ୍ର"</item>
-    <item msgid="5421089790869483206">"ଘଣ୍ଟା"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 679d9d0..a1e0346 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"ଆପଣଙ୍କ ନେଟୱାର୍କ ଏବଂ ୱାୟାରଲେସ ସିଗନାଲକୁ ବ୍ୟବହାର କରି ସ୍ୱତଃ ସେଟ କରନ୍ତୁ"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"ସ୍ୱତଃ ଟାଇମ ଜୋନ"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"ଆପଣଙ୍କ ନିକଟରେ ଥିବା ମୋବାଇଲ ନେଟୱାର୍କ ଆଧାରରେ ସ୍ୱତଃ ସେଟ କରନ୍ତୁ"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"ଯଦି ଉପଲବ୍ଧ ଥାଏ, ତେବେ ଆପଣଙ୍କ ଡିଭାଇସର ଲୋକେସନକୁ ବ୍ୟବହାର କରି ସ୍ୱତଃ ସେଟ ହୋଇଥାଏ। ଏକ ସକ୍ରିୟ ୱାଇଫାଇ କନେକ୍ସନ ମଧ୍ୟ ଆବଶ୍ୟକ ହୋଇପାରେ।"</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"ଡିଫଲ୍ଟ ସ୍ଥାନର ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-ଘଣ୍ଟିଆ ଫର୍ମାଟ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"ସମୟ"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"ଆକ୍ସେସିବିଲିଟୀ"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"ଫିଜିକାଲ୍ କୀବୋର୍ଡ"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"ବାଉନ୍ସ କୀଗୁଡ଼ିକ"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"କୀବୋର୍ଡ ସମାନ କୀ ଶୀଘ୍ର ବାରମ୍ବାର ଦବାଇବାକୁ ଅଣଦେଖା କରେ"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"ବାଉନ୍ସ କୀ ଥ୍ରେସହୋଲ୍ଡ"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"ଆପଣଙ୍କ କୀବୋର୍ଡ ବାରମ୍ବାର କୀ ଦବାଇବାକୁ ଅଣଦେଖା କରୁଥିବା ସମୟ ଅବଧି ବାଛନ୍ତୁ"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0.2s"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0.4s"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0.6s"</string>
     <string name="slow_keys" msgid="2891452895499690837">"ଶ୍ଲୋ କୀଗୁଡ଼ିକ"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"ସକ୍ରିୟ କରିବାକୁ ଏକ କୀ ଦବାଇବା ପାଇଁ ଲାଗୁଥିବା ସମୟକୁ ଏହା ଆଡଜଷ୍ଟ କରେ"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"ଷ୍ଟିକି କୀଗୁଡ଼ିକ"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"ଏକାଠି କୀଗୁଡ଼ିକୁ ଦବାଇ ଧରିବା ପରିବର୍ତ୍ତେ ସର୍ଟକର୍ଟଗୁଡ଼ିକ ପାଇଁ ଥରକେ ଗୋଟିଏ କୀ ଦବାନ୍ତୁ"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"ମାଉସ କୀଗୁଡ଼ିକ"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"ପଏଣ୍ଟରକୁ ନିୟନ୍ତ୍ରଣ କରିବା ପାଇଁ ଆପଣଙ୍କ କୀବୋର୍ଡକୁ ବ୍ୟବହାର କରନ୍ତୁ"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"ମାଉସ ରିଭର୍ସ ସ୍କ୍ରୋଲିଂ"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"ପୃଷ୍ଠାକୁ ତଳକୁ ମୁଭ କରିବା ପାଇଁ ଉପରକୁ ସ୍କ୍ରୋଲ କରନ୍ତୁ"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"ବାମ ଏବଂ ଡାହାଣ ବଟନକୁ ସ୍ୱାପ କରନ୍ତୁ"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"ମାଉସର ବାମ ବଟନକୁ ଆପଣଙ୍କ ଡାହାଣ ବଟନ ଭାବେ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"କୀବୋର୍ଡ଼ ସର୍ଟକଟଗୁଡ଼ିକ"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"ସର୍ଟକଟଗୁଡ଼ିକର ତାଲିକା ଦେଖାନ୍ତୁ"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"ୱର୍କ ପ୍ରୋଫାଇଲ୍ କୀବୋର୍ଡ &amp; ଟୁଲ୍‌ଗୁଡ଼ିକ"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> ପାଇଁ ଏକ ନୂଆ କୀ ବାଛନ୍ତୁ:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"ଫିଜିକାଲ କୀବୋର୍ଡ ଆକ୍ସେସିବିଲିଟୀ"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"ଷ୍ଟିକି କୀ, ବାଉନ୍ସ କୀ, ମାଉସ କୀ"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> ଲେଆଉଟ"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ପୂର୍ବ-ନିର୍ଦ୍ଧାରିତ"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"ପ୍ରିଭ୍ୟୁ"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"ଷ୍ଟାଣ୍ଡାର୍ଡ ବିକଳ୍ପଗୁଡ଼ିକ"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"ଭାଷା"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"କେପ୍ସନ ସାଇଜ"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"କ୍ୟାପସନ୍‌ ଷ୍ଟାଇଲ୍‌"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"କଷ୍ଟମ୍‌ ବିକଳ୍ପଗୁଡିକ"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"ପୃଷ୍ଠପଟ ରଙ୍ଗ"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"ଏହି VPNକୁ ବିଚ୍ଛିନ୍ନ କରିବେ?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"ଡିସକନେକ୍ଟ କରନ୍ତୁ"</string>
     <string name="vpn_version" msgid="6344167191984400976">"ସଂସ୍କରଣ"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"VPNକୁ ଭୁଲିଯାଅ"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"ପୂର୍ବରୁ ଥିବା VPNକୁ ବଦଳାଇବେ?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"ସର୍ବଦା-ଅନ୍‌ ଥିବା VPN ସେଟ୍‌ କରିବେ?"</string>
@@ -5463,13 +5465,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"ସର୍ଚ୍ଚ ସେଟିଂସ"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"କଣ୍ଟାକ୍ଟ, ଷ୍ଟୋରେଜ, ଆକାଉଣ୍ଟ"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"କଣ୍ଟାକ୍ଟ ଷ୍ଟୋରେଜ"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"କେବଳ ଡିଭାଇସ"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"ଏକ ଆକାଉଣ୍ଟ ସହ ନୂଆ କଣ୍ଟାକ୍ଟଗୁଡ଼ିକ ସିଙ୍କ ହେବ ନାହିଁ"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"କଣ୍ଟାକ୍ଟଗୁଡ଼ିକ ଆପଣଙ୍କ ଡିଭାଇସରେ ସେଭ ହେବ ଏବଂ ଡିଫଲ୍ଟ ଭାବେ ଆପଣଙ୍କ ଆକାଉଣ୍ଟରେ ସିଙ୍କ ହେବ"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"କୌଣସି ଡିଫଲ୍ଟ ଆକାଉଣ୍ଟ ସେଟ କରାଯାଇନାହିଁ"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"ଆରମ୍ଭ କରିବାକୁ ଏକ ଆକାଉଣ୍ଟ ଯୋଗ କରନ୍ତୁ"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-pa/arrays.xml b/res/values-pa/arrays.xml
index 3b40ab4..a62f21a 100644
--- a/res/values-pa/arrays.xml
+++ b/res/values-pa/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"ਬ੍ਰੀਫ਼ਕੇਸ"</item>
-    <item msgid="184985872234062767">"ਕਲਾਸਿਕਲ ਇਮਾਰਤ"</item>
-    <item msgid="9189550412466785530">"ਅਪਾਰਟਮੈਂਟ ਇਮਾਰਤ"</item>
-    <item msgid="2142527562511049422">"ਵਾਕ ਬੱਬਲ"</item>
-    <item msgid="2548100558260478605">"ਲੋਕਾਂ ਦਾ ਗਰੁੱਪ"</item>
-    <item msgid="2270003903304578284">"ਲਾਈਟ ਬਲਬ"</item>
-    <item msgid="4793496619091161864">"ਕੈਲੰਡਰ"</item>
-    <item msgid="5673625795644364100">"ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ"</item>
-    <item msgid="1423820834865831361">"ਦੌੜਦਾ ਹੋਇਆ ਵਿਅਕਤੀ"</item>
-    <item msgid="2037298830718732608">"ਗੌਲਫ਼"</item>
-    <item msgid="2197835014443491074">"ਜਿਮ ਦਾ ਡੰਬਲ"</item>
-    <item msgid="2730180105015616518">"ਤੈਰਾਕੀ"</item>
-    <item msgid="2666922823253345958">"ਹਾਈਕਿੰਗ ਕਰਦਾ ਵਿਅਕਤੀ"</item>
-    <item msgid="8234880356472211396">"ਗੇਂਦ ਸੁੱਟਦਾ ਵਿਅਕਤੀ"</item>
-    <item msgid="4642980625253001443">"ਕਿੱਕ ਮਾਰਦਾ ਵਿਅਕਤੀ"</item>
-    <item msgid="4324795269518833500">"ਗੇਮ ਕੰਟਰੋਲਰ"</item>
-    <item msgid="7789966425125441125">"ਕਲਾਕਾਰ ਲਈ ਰੰਗ ਪਟਲ"</item>
-    <item msgid="663512680597461570">"ਸਨੋਫਲੇਕ"</item>
-    <item msgid="7952183800501346803">"ਬੀਚ ਵਾਲੀ ਛੱਤਰੀ"</item>
-    <item msgid="799139025758265891">"ਵਰਕਸ਼ਾਪ ਦੇ ਔਜ਼ਾਰ"</item>
-    <item msgid="1330084588359129896">"ਤੰਬੂ"</item>
-    <item msgid="3861584909935022342">"ਫ਼ਿਲਮ ਰੀਲ"</item>
-    <item msgid="5827426100157335512">"ਬੁੱਕ ਕਰੋ"</item>
-    <item msgid="8585828346253128384">"ਕਮਲ ਦਾ ਫੁੱਲ"</item>
-    <item msgid="8788370542815300188">"ਵਿਅਕਤੀ ਦਾ ਮਨ"</item>
-    <item msgid="7287354964767553293">"ਹੈੱਡਫ਼ੋਨ"</item>
-    <item msgid="2530059623783800987">"ਟੀਵੀ"</item>
-    <item msgid="5307182323469376758">"ਰੇਲ ਗੱਡੀ"</item>
-    <item msgid="4903790544026923026">"ਕਾਰ"</item>
-    <item msgid="5010405583912314582">"ਕਾਂਟਾ ਅਤੇ ਛੁਰੀ"</item>
-    <item msgid="8939998598599064900">"ਖ਼ਰੀਦਦਾਰੀ ਕਾਰਟ"</item>
-    <item msgid="3379605903308731893">"ਬੱਚਾ"</item>
-    <item msgid="7808668968550293112">"ਜਾਨਵਰ ਦਾ ਪੰਜਾ"</item>
-    <item msgid="1000692647524056504">"ਸਟਾਰ ਬੈਜ"</item>
-    <item msgid="8270261073421676502">"ਦੋ ਲੋਕ"</item>
-    <item msgid="5767782819651505460">"ਤਾਰਾ"</item>
-    <item msgid="4368451291862729334">"ਦਿਲ"</item>
-    <item msgid="2613199102208419986">"ਘਰ"</item>
-    <item msgid="3022279986430275040">"ਅੱਧਾ-ਚੰਨ"</item>
-    <item msgid="5421089790869483206">"ਘੜੀ"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 21cfb97..dbf65de 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"ਨੈੱਟਵਰਕ ਅਤੇ ਵਾਇਰਲੈੱਸ ਸਿਗਨਲਾਂ ਵਰਤ ਕੇ ਤਾਰੀਖ ਅਤੇ ਸਮਾਂ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸੈੱਟ ਹੋਣ ਦੀ ਸੁਵਿਧਾ ਪਾਓ"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"ਸਮਾਂ ਖੇਤਰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸੈੱਟ ਹੋਣ ਦੀ ਸੁਵਿਧਾ"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"ਆਪਣੇ ਨੇੜੇ-ਤੇੜੇ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕਾਂ ਦੇ ਆਧਾਰ \'ਤੇ ਤਾਰੀਖ ਅਤੇ ਸਮਾਂ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸੈੱਟ ਹੋਣ ਦੀ ਸੁਵਿਧਾ ਪਾਓ"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"ਡੀਵਾਈਸ ਟਿਕਾਣੇ ਦੇ ਮੁਤਾਬਕ ਸਮਾਂ ਅਤੇ ਤਾਰੀਖ ਖੁਦ ਸੈੱਟ ਹੋਣ ਦੀ ਸੁਵਿਧਾ ਪਾਓ। ਵਾਈ-ਫਾਈ ਕਨੈਕਸ਼ਨ ਦੀ ਲੋੜ ਪੈ ਸਕਦੀ ਹੈ।"</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"ਪੂਰਵ-ਨਿਰਧਾਰਿਤ ਸਥਾਨਕ ਸਮਾਂ ਵਰਤੋ"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-ਘੰਟੇ ਵਾਲਾ ਫਾਰਮੈਟ ਵਰਤੋ"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"ਸਮਾਂ"</string>
@@ -1958,6 +1959,10 @@
     <string name="sticky_keys_summary" msgid="1844953803625480623">"ਸ਼ਾਰਟਕੱਟਾਂ ਲਈ ਕੁੰਜੀਆਂ ਨੂੰ ਇਕੱਠੇ ਦਬਾਈ ਰੱਖਣ ਦੀ ਬਜਾਏ ਇੱਕ ਵਾਰ ਵਿੱਚ ਇੱਕ ਕੁੰਜੀ ਦਬਾਓ"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"ਮਾਊਸ ਕੁੰਜੀਆਂ"</string>
     <string name="mouse_keys_summary" msgid="7030731235143286467">"ਪੁਆਇੰਟਰ ਨੂੰ ਕੰਟਰੋਲ ਕਰਨ ਲਈ ਆਪਣਾ ਕੀ-ਬੋਰਡ ਵਰਤੋ"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"ਮਾਊਸ ਦੀ ਉਲਟ ਸਕ੍ਰੋਲਿੰਗ"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"ਪੰਨੇ ਨੂੰ ਹੇਠਾਂ ਲਿਜਾਉਣ ਲਈ ਉੱਪਰ ਵੱਲ ਸਕ੍ਰੋਲ ਕਰੋ"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"ਖੱਬੇ ਅਤੇ ਸੱਜੇ ਬਟਨਾਂ ਨੂੰ ਸਵੈਪ ਕਰੋ"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"ਮਾਊਸ ਦੇ ਖੱਬੇ ਬਟਨ ਨੂੰ ਆਪਣੇ ਸੱਜੇ ਬਟਨ ਵਜੋਂ ਵਰਤੋ"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"ਕੀ-ਬੋਰਡ ਸ਼ਾਰਟਕੱਟ"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"ਸ਼ਾਰਟਕੱਟਾਂ ਦੀ ਸੂਚੀ ਦਿਖਾਓ"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਕੀ-ਬੋਰਡ ਅਤੇ ਟੂਲ"</string>
@@ -2026,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> ਲਈ ਨਵੀਂ ਕੁੰਜੀ ਚੁਣੋ:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"ਭੌਤਿਕ ਕੀ-ਬੋਰਡ ਪਹੁੰਚਯੋਗਤਾ"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"ਸਥਿਰ ਕੁੰਜੀਆਂ, ਬਾਊਂਸ ਕੁੰਜੀਆਂ, ਮਾਊਸ ਕੁੰਜੀਆਂ"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> ਖਾਕਾ"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ਪੂਰਵ-ਨਿਰਧਾਰਿਤ"</string>
@@ -2434,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"ਪੂਰਵ-ਝਲਕ"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"ਮਿਆਰੀ ਚੋਣਾਂ"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"ਭਾਸ਼ਾ"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"ਸੁਰਖੀ ਦਾ ਆਕਾਰ"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"ਸੁਰਖੀ ਦੀ ਸ਼ੈਲੀ"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"ਵਿਉਂਂਤੀ ਵਿਕਲਪ"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"ਬੈਕਗ੍ਰਾਉਂਡ ਦਾ ਰੰਗ"</string>
@@ -2979,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"ਇਹ VPN ਡਿਸਕਨੈਕਟ ਕਰੀਏ?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"ਡਿਸਕਨੈਕਟ ਕਰੋ"</string>
     <string name="vpn_version" msgid="6344167191984400976">"ਵਰਜਨ"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN ਨੂੰ ਭੁੱਲ ਜਾਓ"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"ਕੀ ਮੌਜੂਦਾ VPN ਨੂੰ ਤਬਦੀਲ ਕਰਨਾ ਹੈ?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"ਕੀ ਹਮੇਸ਼ਾ-ਚਾਲੂ VPN ਨੂੰ ਸੈੱਟ ਕਰਨਾ ਹੈ?"</string>
@@ -5459,4 +5469,8 @@
     <string name="contacts_storage_selection_message" msgid="8082077300632059003">"ਸੰਪਰਕਾਂ ਨੂੰ ਪੂਰਵ-ਨਿਰਧਾਰਿਤ ਤੌਰ \'ਤੇ ਤੁਹਾਡੇ ਡੀਵਾਈਸ \'ਤੇ ਰੱਖਿਅਤ ਕੀਤਾ ਜਾਵੇਗਾ ਅਤੇ ਤੁਹਾਡੇ ਖਾਤੇ ਨਾਲ ਸਿੰਕ ਕੀਤਾ ਜਾਵੇਗਾ"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"ਕੁਝ ਵੀ ਪੂਰਵ-ਨਿਰਧਾਰਿਤ ਵਜੋਂ ਸੈੱਟ ਨਹੀਂ ਹੈ"</string>
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"ਸ਼ੁਰੂਆਤ ਕਰਨ ਲਈ ਕੋਈ ਖਾਤਾ ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
+    <skip />
 </resources>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index b2634cd..37d5a3a 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Teczka"</item>
-    <item msgid="184985872234062767">"Budynek klasycystyczny"</item>
-    <item msgid="9189550412466785530">"Blok mieszkalny"</item>
-    <item msgid="2142527562511049422">"Dymek z tekstem"</item>
-    <item msgid="2548100558260478605">"Grupa ludzi"</item>
-    <item msgid="2270003903304578284">"Żarówka"</item>
-    <item msgid="4793496619091161864">"Kalendarz"</item>
-    <item msgid="5673625795644364100">"Nie przeszkadzać"</item>
-    <item msgid="1423820834865831361">"Biegnąca osoba"</item>
-    <item msgid="2037298830718732608">"Golf"</item>
-    <item msgid="2197835014443491074">"Hantla gimnastyczna"</item>
-    <item msgid="2730180105015616518">"Pływanie"</item>
-    <item msgid="2666922823253345958">"Osoba wędrująca"</item>
-    <item msgid="8234880356472211396">"Osoba rzucająca piłkę"</item>
-    <item msgid="4642980625253001443">"Osoba kopiąca"</item>
-    <item msgid="4324795269518833500">"Kontroler do gier"</item>
-    <item msgid="7789966425125441125">"Paleta kolorów artysty"</item>
-    <item msgid="663512680597461570">"Płatek śniegu"</item>
-    <item msgid="7952183800501346803">"Parasol plażowy"</item>
-    <item msgid="799139025758265891">"Narzędzia warsztatowe"</item>
-    <item msgid="1330084588359129896">"Namiot"</item>
-    <item msgid="3861584909935022342">"Klatka filmowa"</item>
-    <item msgid="5827426100157335512">"Książka"</item>
-    <item msgid="8585828346253128384">"Kwiat lotosu"</item>
-    <item msgid="8788370542815300188">"Umysł osoby"</item>
-    <item msgid="7287354964767553293">"Słuchawki"</item>
-    <item msgid="2530059623783800987">"Telewizor"</item>
-    <item msgid="5307182323469376758">"Pociąg"</item>
-    <item msgid="4903790544026923026">"Samochód"</item>
-    <item msgid="5010405583912314582">"Nóż i widelec"</item>
-    <item msgid="8939998598599064900">"Koszyk na zakupy"</item>
-    <item msgid="3379605903308731893">"Dziecko"</item>
-    <item msgid="7808668968550293112">"Łapa zwierzęcia"</item>
-    <item msgid="1000692647524056504">"Plakietka z gwiazdką"</item>
-    <item msgid="8270261073421676502">"2 osoby"</item>
-    <item msgid="5767782819651505460">"Gwiazdka"</item>
-    <item msgid="4368451291862729334">"Serce"</item>
-    <item msgid="2613199102208419986">"Dom"</item>
-    <item msgid="3022279986430275040">"Półksiężyc"</item>
-    <item msgid="5421089790869483206">"Zegar"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 92057eb..f9801b9 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -250,7 +250,7 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Ustaw automatycznie za pomocą sygnałów bezprzewodowych i sieci"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Automatyczna strefa czasowa"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Ustaw automatycznie na podstawie pobliskich sieci komórkowych"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Ustaw automatycznie według lokalizacji, jeśli jest dostępna. Może być też wymagane aktywne Wi-Fi."</string>
+    <string name="auto_zone_requires_location_summary" msgid="2366567167956530124">"Ustaw automatycznie według lokalizacji, jeśli jest dostępna"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Używaj ustawień domyślnych dla regionu"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Format 24-godzinny"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Godzina"</string>
@@ -1946,26 +1946,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Ułatwienia dostępu"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Klawiatura fizyczna"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Klawisze z filtrem powtórzeń"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Klawiatura ignoruje szybko powtarzane naciśnięcia tego samego klawisza"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Próg klawisza z filtrem powtórzeń"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Wybierz czas, przez który klawiatura ma ignorować powtarzane naciśnięcia klawiszy"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2 s"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4 s"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0,6 s"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Klawisze powolne"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Dostosowuje czas wymagany do aktywacji naciśnięcia klawisza"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Klawisze trwałe"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Naciśnij 1 klawisz, aby zyskać dostęp do skrótów, zamiast przytrzymywać kilka jednocześnie"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Klawisze sterowania myszą"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Używaj klawiatury do sterowania wskaźnikiem"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Odwrotne przewijanie myszą"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Przewiń w górę, aby przesunąć stronę w dół"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Zamień lewy i prawy przycisk"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Używaj lewego przycisku myszy jako prawego"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Skróty klawiszowe"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Lista skrótów"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Klawiatura i narzędzia w profilu służbowym"</string>
@@ -2034,10 +2030,10 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Wybierz nowy klawisz jako <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Ułatwienia dostępu z klawiatury fizycznej"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Klawisze trwałe, Klawisze z filtrem powtórzeń, klawisze sterowania myszą"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
-    <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
-    <skip />
+    <string name="keyboard_repeat_keys_title" msgid="6346877755243280735">"Powtarzaj znaki klawiszy"</string>
+    <string name="keyboard_repeat_keys_timeout_title" msgid="3411871149974652293">"Opóźnienie przed powtórzeniem"</string>
+    <string name="keyboard_repeat_keys_delay_title" msgid="7323531750483922943">"Szybkość powtarzania"</string>
+    <string name="keyboard_repeat_keys_summary" msgid="8972905345211768313">"Przytrzymaj klawisz, aby powtarzać dany znak"</string>
     <string name="ime_label_title" msgid="8994569521516807168">"Układ <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Domyślny"</string>
     <string name="automatic_keyboard_layout_label" msgid="9138088156046198913">"Automatyczny: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
@@ -2442,8 +2438,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Podgląd"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Opcje standardowe"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Język"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Rozmiar napisów"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Styl napisów"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Opcje niestandardowe"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Kolor tła"</string>
@@ -2987,6 +2982,7 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Odłączyć tę sieć VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Odłącz"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Wersja"</string>
+    <string name="vpn_version_info" msgid="5717671228402924155">"Wersja <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="729132269203870205">"Zapomnij VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Zastąpić obecną sieć VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Ustawić stały VPN?"</string>
@@ -5464,13 +5460,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Ustawienia wyszukiwania"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"kontakty, spis, konto"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Spis kontaktów"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Tylko urządzenie"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Nowe kontakty nie będą synchronizowane z kontem"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kontakty będą domyślnie zapisywane na urządzeniu i synchronizowane z kontem"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Nie ustawiono konta domyślnego"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Na początek dodaj konto"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-pt-rBR/arrays.xml b/res/values-pt-rBR/arrays.xml
index 6822b22..3fe4241 100644
--- a/res/values-pt-rBR/arrays.xml
+++ b/res/values-pt-rBR/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Maleta"</item>
-    <item msgid="184985872234062767">"Edifício clássico"</item>
-    <item msgid="9189550412466785530">"Edifício de apartamentos"</item>
-    <item msgid="2142527562511049422">"Balão de diálogo"</item>
-    <item msgid="2548100558260478605">"Grupo de pessoas"</item>
-    <item msgid="2270003903304578284">"Lâmpada"</item>
-    <item msgid="4793496619091161864">"Calendário"</item>
-    <item msgid="5673625795644364100">"Não perturbe"</item>
-    <item msgid="1423820834865831361">"Pessoa correndo"</item>
-    <item msgid="2037298830718732608">"Golfe"</item>
-    <item msgid="2197835014443491074">"Peso de academia"</item>
-    <item msgid="2730180105015616518">"Natação"</item>
-    <item msgid="2666922823253345958">"Pessoa escalando"</item>
-    <item msgid="8234880356472211396">"Pessoa jogando bola"</item>
-    <item msgid="4642980625253001443">"Pessoa chutando"</item>
-    <item msgid="4324795269518833500">"Controle de jogo"</item>
-    <item msgid="7789966425125441125">"Paleta de cores do artista"</item>
-    <item msgid="663512680597461570">"Floco de neve"</item>
-    <item msgid="7952183800501346803">"Guarda-sol"</item>
-    <item msgid="799139025758265891">"Ferramentas"</item>
-    <item msgid="1330084588359129896">"Barraca"</item>
-    <item msgid="3861584909935022342">"Rolo de filme"</item>
-    <item msgid="5827426100157335512">"Livro"</item>
-    <item msgid="8585828346253128384">"Flor de lótus"</item>
-    <item msgid="8788370542815300188">"Mente humana"</item>
-    <item msgid="7287354964767553293">"Fones de ouvido"</item>
-    <item msgid="2530059623783800987">"TV"</item>
-    <item msgid="5307182323469376758">"Trem"</item>
-    <item msgid="4903790544026923026">"Carro"</item>
-    <item msgid="5010405583912314582">"Garfo e faca"</item>
-    <item msgid="8939998598599064900">"Carrinho de compras"</item>
-    <item msgid="3379605903308731893">"Criança"</item>
-    <item msgid="7808668968550293112">"Pata de animal"</item>
-    <item msgid="1000692647524056504">"Selo de estrela"</item>
-    <item msgid="8270261073421676502">"Duas pessoas"</item>
-    <item msgid="5767782819651505460">"Estrela"</item>
-    <item msgid="4368451291862729334">"Coração"</item>
-    <item msgid="2613199102208419986">"Casa"</item>
-    <item msgid="3022279986430275040">"Meia-lua"</item>
-    <item msgid="5421089790869483206">"Relógio"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 7700159..3f4a5d0 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Definir automaticamente usando sua rede e sinais sem fio"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Fuso horário automático"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Definir automaticamente com base nas redes móveis perto de você"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Definir automaticamente usando o local do dispositivo, se disponível. Também pode ser necessário ter uma conexão Wi-Fi ativa."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Usar o padrão do local"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Usar formato de 24 horas"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Horário"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Acessibilidade"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Teclado físico"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Teclas de filtragem"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"O teclado ignora pressionamentos rápidos e repetidos da mesma tecla"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Limite da tecla de filtragem"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Escolha por quanto tempo o teclado ignora pressionamentos repetidos"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2s"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4s"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0,6s"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Teclas lentas"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Ajusta o tempo que leva para um pressionamento de tecla ser ativado"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Teclas de aderência"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Pressione uma tecla por vez para usar atalhos em vez de manter as teclas pressionadas juntas"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Teclas do mouse"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Use o teclado para controlar o ponteiro"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Rolagem reversa do mouse"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Deslize para cima para descer na página"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Trocar os botões esquerdo e direito"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Use o botão esquerdo do mouse como o direito"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Atalhos do teclado"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Mostrar lista de atalhos"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Teclados e ferramentas de perfil de trabalho"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Escolha uma nova tecla para <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Acessibilidade do teclado físico"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Teclas de aderência, teclas de filtragem, teclas do mouse"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Layout do <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Padrão"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Visualização"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Opções padrão"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Idioma"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Tamanho da legenda"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Estilo da legenda"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Opções de personalização"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Cor do plano de fundo"</string>
@@ -2625,7 +2625,7 @@
     <string name="power_wifi" msgid="4614007837288250325">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="5085900180846238196">"Bluetooth"</string>
     <string name="power_cell" msgid="7793805106954398186">"Rede móvel"</string>
-    <string name="power_phone" msgid="2768396619208561670">"Chamadas de voz"</string>
+    <string name="power_phone" msgid="2768396619208561670">"Ligações"</string>
     <string name="battery_screen_usage" msgid="90008745183187461">"Uso da tela: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="6457305178016189330">"<xliff:g id="PERCENT">%1$s</xliff:g> de uso por <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="8940140259734182014">"<xliff:g id="PERCENT">%1$s</xliff:g> da bateria total"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Desconectar esta VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Desconectar"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versão"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Esquecer VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Substituir VPN já existente?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Configurar VPN sempre ativa?"</string>
@@ -4941,7 +4943,7 @@
     <string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Bateria"</string>
     <string name="settings_panel_title" msgid="346363079938069215">"Painel de configurações"</string>
     <string name="enable_desktop_mode" msgid="5644818402534562302">"Ativar janelas de forma livre"</string>
-    <string name="enable_desktop_mode_on_secondary_display" msgid="2609567824593768780">"Permitir janelas de forma livre na tela secundária"</string>
+    <string name="enable_desktop_mode_on_secondary_display" msgid="2609567824593768780">"Ativar janelas de forma livre na tela secundária"</string>
     <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Ativar recursos não redimensionáveis em várias janelas"</string>
     <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Permitir que apps não redimensionáveis sejam usados em várias janelas"</string>
     <string name="hwui_force_dark_title" msgid="4256904905631994219">"Manter o recurso Forçar modo escuro ativado"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Pesquisar configurações"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"contatos, armazenamento, conta"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Armazenamento de contatos"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Somente dispositivo"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Os novos contatos não serão sincronizados com uma conta"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Os contatos serão salvos no seu dispositivo e sincronizados com sua conta por padrão"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Nenhuma conta padrão configurada"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Adicione uma conta para começar"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 15a519e..319e19b 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Pasta de trabalho"</item>
-    <item msgid="184985872234062767">"Edifício clássico"</item>
-    <item msgid="9189550412466785530">"Edifício de apartamentos"</item>
-    <item msgid="2142527562511049422">"Balão de fala"</item>
-    <item msgid="2548100558260478605">"Grupo de pessoas"</item>
-    <item msgid="2270003903304578284">"Lâmpada"</item>
-    <item msgid="4793496619091161864">"Calendário"</item>
-    <item msgid="5673625795644364100">"Não incomodar"</item>
-    <item msgid="1423820834865831361">"Pessoa a correr"</item>
-    <item msgid="2037298830718732608">"Golfe"</item>
-    <item msgid="2197835014443491074">"Haltere de ginásio"</item>
-    <item msgid="2730180105015616518">"Natação"</item>
-    <item msgid="2666922823253345958">"Pessoa a caminhar"</item>
-    <item msgid="8234880356472211396">"Pessoa a atirar uma bola"</item>
-    <item msgid="4642980625253001443">"Pessoa a pontapear"</item>
-    <item msgid="4324795269518833500">"Comando de jogos"</item>
-    <item msgid="7789966425125441125">"Paleta de cores artística"</item>
-    <item msgid="663512680597461570">"Floco de neve"</item>
-    <item msgid="7952183800501346803">"Guarda-sol"</item>
-    <item msgid="799139025758265891">"Ferramentas de oficina"</item>
-    <item msgid="1330084588359129896">"Tenda"</item>
-    <item msgid="3861584909935022342">"Bobina de filme"</item>
-    <item msgid="5827426100157335512">"Livro"</item>
-    <item msgid="8585828346253128384">"Flor de lótus"</item>
-    <item msgid="8788370542815300188">"A mente da pessoa"</item>
-    <item msgid="7287354964767553293">"Auscultadores"</item>
-    <item msgid="2530059623783800987">"TV"</item>
-    <item msgid="5307182323469376758">"Comboio"</item>
-    <item msgid="4903790544026923026">"Carro"</item>
-    <item msgid="5010405583912314582">"Garfo e faca"</item>
-    <item msgid="8939998598599064900">"Carrinho de compras"</item>
-    <item msgid="3379605903308731893">"Criança"</item>
-    <item msgid="7808668968550293112">"Pata de animal"</item>
-    <item msgid="1000692647524056504">"Emblema de estrela"</item>
-    <item msgid="8270261073421676502">"2 pessoas"</item>
-    <item msgid="5767782819651505460">"Estrela"</item>
-    <item msgid="4368451291862729334">"Coração"</item>
-    <item msgid="2613199102208419986">"Casa"</item>
-    <item msgid="3022279986430275040">"Meia-lua"</item>
-    <item msgid="5421089790869483206">"Relógio"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index d3ec13e..920d318 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Definir automaticamente com base na sua rede e sinais sem fios"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Fuso horário automático"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Definir automaticamente com base nas redes móveis perto de si"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Definir autom. c/ localização do disp., se disponível. Também pode ser necessária uma ligação Wi-Fi ativa."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Usar local predefinido"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Usar formato de 24 horas"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Hora"</string>
@@ -1958,6 +1959,10 @@
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Prima uma tecla de cada vez para os atalhos em vez de manter as teclas premidas em simultâneo"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Teclas do rato"</string>
     <string name="mouse_keys_summary" msgid="7030731235143286467">"Use o teclado para controlar o ponteiro"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Deslocamento inverso do rato"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Desloque para cima para mover a página para baixo"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Trocar botões esquerdo e direito"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Use o botão esquerdo do rato como o botão direito"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Atalhos de teclado"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Mostre a lista de atalhos"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Teclados e ferramentas do perfil de trabalho"</string>
@@ -2026,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Escolha uma nova tecla para <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Acessibilidade do teclado físico"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Teclas aderentes, teclas sem repetição, teclas do rato"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Esquema do <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Predefinição"</string>
@@ -2434,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Pré-visualizar"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Opções padrão"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Idioma"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Tamanho das legendas"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Estilo das legendas"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Opções personalizadas"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Cor de fundo"</string>
@@ -2979,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Quer desligar esta VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Desligar"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versão"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Esquecer VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Quer substituir a VPN existente?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Quer definir a VPN como sempre ativa?"</string>
@@ -5459,4 +5469,8 @@
     <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Os contactos vão ser guardados no dispositivo e sincronizados com a sua conta por predefinição"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Nenhuma conta predefinida"</string>
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Adicione uma conta para começar"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
+    <skip />
 </resources>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 6822b22..3fe4241 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Maleta"</item>
-    <item msgid="184985872234062767">"Edifício clássico"</item>
-    <item msgid="9189550412466785530">"Edifício de apartamentos"</item>
-    <item msgid="2142527562511049422">"Balão de diálogo"</item>
-    <item msgid="2548100558260478605">"Grupo de pessoas"</item>
-    <item msgid="2270003903304578284">"Lâmpada"</item>
-    <item msgid="4793496619091161864">"Calendário"</item>
-    <item msgid="5673625795644364100">"Não perturbe"</item>
-    <item msgid="1423820834865831361">"Pessoa correndo"</item>
-    <item msgid="2037298830718732608">"Golfe"</item>
-    <item msgid="2197835014443491074">"Peso de academia"</item>
-    <item msgid="2730180105015616518">"Natação"</item>
-    <item msgid="2666922823253345958">"Pessoa escalando"</item>
-    <item msgid="8234880356472211396">"Pessoa jogando bola"</item>
-    <item msgid="4642980625253001443">"Pessoa chutando"</item>
-    <item msgid="4324795269518833500">"Controle de jogo"</item>
-    <item msgid="7789966425125441125">"Paleta de cores do artista"</item>
-    <item msgid="663512680597461570">"Floco de neve"</item>
-    <item msgid="7952183800501346803">"Guarda-sol"</item>
-    <item msgid="799139025758265891">"Ferramentas"</item>
-    <item msgid="1330084588359129896">"Barraca"</item>
-    <item msgid="3861584909935022342">"Rolo de filme"</item>
-    <item msgid="5827426100157335512">"Livro"</item>
-    <item msgid="8585828346253128384">"Flor de lótus"</item>
-    <item msgid="8788370542815300188">"Mente humana"</item>
-    <item msgid="7287354964767553293">"Fones de ouvido"</item>
-    <item msgid="2530059623783800987">"TV"</item>
-    <item msgid="5307182323469376758">"Trem"</item>
-    <item msgid="4903790544026923026">"Carro"</item>
-    <item msgid="5010405583912314582">"Garfo e faca"</item>
-    <item msgid="8939998598599064900">"Carrinho de compras"</item>
-    <item msgid="3379605903308731893">"Criança"</item>
-    <item msgid="7808668968550293112">"Pata de animal"</item>
-    <item msgid="1000692647524056504">"Selo de estrela"</item>
-    <item msgid="8270261073421676502">"Duas pessoas"</item>
-    <item msgid="5767782819651505460">"Estrela"</item>
-    <item msgid="4368451291862729334">"Coração"</item>
-    <item msgid="2613199102208419986">"Casa"</item>
-    <item msgid="3022279986430275040">"Meia-lua"</item>
-    <item msgid="5421089790869483206">"Relógio"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 7700159..3f4a5d0 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Definir automaticamente usando sua rede e sinais sem fio"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Fuso horário automático"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Definir automaticamente com base nas redes móveis perto de você"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Definir automaticamente usando o local do dispositivo, se disponível. Também pode ser necessário ter uma conexão Wi-Fi ativa."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Usar o padrão do local"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Usar formato de 24 horas"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Horário"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Acessibilidade"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Teclado físico"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Teclas de filtragem"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"O teclado ignora pressionamentos rápidos e repetidos da mesma tecla"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Limite da tecla de filtragem"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Escolha por quanto tempo o teclado ignora pressionamentos repetidos"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2s"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4s"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0,6s"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Teclas lentas"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Ajusta o tempo que leva para um pressionamento de tecla ser ativado"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Teclas de aderência"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Pressione uma tecla por vez para usar atalhos em vez de manter as teclas pressionadas juntas"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Teclas do mouse"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Use o teclado para controlar o ponteiro"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Rolagem reversa do mouse"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Deslize para cima para descer na página"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Trocar os botões esquerdo e direito"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Use o botão esquerdo do mouse como o direito"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Atalhos do teclado"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Mostrar lista de atalhos"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Teclados e ferramentas de perfil de trabalho"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Escolha uma nova tecla para <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Acessibilidade do teclado físico"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Teclas de aderência, teclas de filtragem, teclas do mouse"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Layout do <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Padrão"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Visualização"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Opções padrão"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Idioma"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Tamanho da legenda"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Estilo da legenda"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Opções de personalização"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Cor do plano de fundo"</string>
@@ -2625,7 +2625,7 @@
     <string name="power_wifi" msgid="4614007837288250325">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="5085900180846238196">"Bluetooth"</string>
     <string name="power_cell" msgid="7793805106954398186">"Rede móvel"</string>
-    <string name="power_phone" msgid="2768396619208561670">"Chamadas de voz"</string>
+    <string name="power_phone" msgid="2768396619208561670">"Ligações"</string>
     <string name="battery_screen_usage" msgid="90008745183187461">"Uso da tela: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="6457305178016189330">"<xliff:g id="PERCENT">%1$s</xliff:g> de uso por <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="8940140259734182014">"<xliff:g id="PERCENT">%1$s</xliff:g> da bateria total"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Desconectar esta VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Desconectar"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versão"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Esquecer VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Substituir VPN já existente?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Configurar VPN sempre ativa?"</string>
@@ -4941,7 +4943,7 @@
     <string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Bateria"</string>
     <string name="settings_panel_title" msgid="346363079938069215">"Painel de configurações"</string>
     <string name="enable_desktop_mode" msgid="5644818402534562302">"Ativar janelas de forma livre"</string>
-    <string name="enable_desktop_mode_on_secondary_display" msgid="2609567824593768780">"Permitir janelas de forma livre na tela secundária"</string>
+    <string name="enable_desktop_mode_on_secondary_display" msgid="2609567824593768780">"Ativar janelas de forma livre na tela secundária"</string>
     <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Ativar recursos não redimensionáveis em várias janelas"</string>
     <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Permitir que apps não redimensionáveis sejam usados em várias janelas"</string>
     <string name="hwui_force_dark_title" msgid="4256904905631994219">"Manter o recurso Forçar modo escuro ativado"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Pesquisar configurações"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"contatos, armazenamento, conta"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Armazenamento de contatos"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Somente dispositivo"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Os novos contatos não serão sincronizados com uma conta"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Os contatos serão salvos no seu dispositivo e sincronizados com sua conta por padrão"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Nenhuma conta padrão configurada"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Adicione uma conta para começar"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index b7d382c..b1c4771 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Servietă"</item>
-    <item msgid="184985872234062767">"Clădire clasică"</item>
-    <item msgid="9189550412466785530">"Bloc de locuințe"</item>
-    <item msgid="2142527562511049422">"Balon explicativ"</item>
-    <item msgid="2548100558260478605">"Grup de persoane"</item>
-    <item msgid="2270003903304578284">"Bec"</item>
-    <item msgid="4793496619091161864">"Calendar"</item>
-    <item msgid="5673625795644364100">"Nu deranja"</item>
-    <item msgid="1423820834865831361">"Persoană care aleargă"</item>
-    <item msgid="2037298830718732608">"Golf"</item>
-    <item msgid="2197835014443491074">"Ganteră"</item>
-    <item msgid="2730180105015616518">"Înot"</item>
-    <item msgid="2666922823253345958">"Persoană care face ascensiuni"</item>
-    <item msgid="8234880356472211396">"Persoană care aruncă o minge"</item>
-    <item msgid="4642980625253001443">"Persoană care dă un șut"</item>
-    <item msgid="4324795269518833500">"Controler de jocuri"</item>
-    <item msgid="7789966425125441125">"Paletă de culori pentru artiști"</item>
-    <item msgid="663512680597461570">"Fulg de nea"</item>
-    <item msgid="7952183800501346803">"Umbrelă de plajă"</item>
-    <item msgid="799139025758265891">"Instrumente din atelier"</item>
-    <item msgid="1330084588359129896">"Cort"</item>
-    <item msgid="3861584909935022342">"Bobină de film"</item>
-    <item msgid="5827426100157335512">"Carte"</item>
-    <item msgid="8585828346253128384">"Floare de lotus"</item>
-    <item msgid="8788370542815300188">"Mintea unei persoane"</item>
-    <item msgid="7287354964767553293">"Căști"</item>
-    <item msgid="2530059623783800987">"Televizor"</item>
-    <item msgid="5307182323469376758">"Tren"</item>
-    <item msgid="4903790544026923026">"Mașină"</item>
-    <item msgid="5010405583912314582">"Furculiță și cuțit"</item>
-    <item msgid="8939998598599064900">"Coș de cumpărături"</item>
-    <item msgid="3379605903308731893">"Copil"</item>
-    <item msgid="7808668968550293112">"Labă de animal"</item>
-    <item msgid="1000692647524056504">"Insignă stea"</item>
-    <item msgid="8270261073421676502">"Două persoane"</item>
-    <item msgid="5767782819651505460">"Stea"</item>
-    <item msgid="4368451291862729334">"Inimă"</item>
-    <item msgid="2613199102208419986">"Casă"</item>
-    <item msgid="3022279986430275040">"Semilună"</item>
-    <item msgid="5421089790869483206">"Ceas"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 44e38ba..23095e9 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Setează automat folosind semnalele de rețea și wireless"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Fus orar automat"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Setează automat în funcție de rețelele mobile din apropiere"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Setează automat folosind locația, dacă este disponibilă. Poate fi necesară o conexiune Wi-Fi activă."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Folosește codul local prestabilit"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Folosește formatul de 24 de ore"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Oră"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Accesibilitate"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Tastatură fizică"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Taste nerepetate"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Tastatura ignoră apăsările repetate rapid ale aceleiași taste"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Pragul pentru evitarea apăsării repetate"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Alege durata de timp în care tastatura ignoră apăsările repetate ale tastelor"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2 s"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4 s"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0,6 s"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Taste lente"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Ajustează timpul necesar pentru activarea unei apăsări de tastă"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Taste adezive"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Apasă câte o tastă pentru comenzile rapide în loc să ții apăsate tastele împreună"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Butoanele mouse-ului"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Folosește tastatura pentru a controla indicatorul"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Derularea inversă cu mouse-ul"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Derulează în sus pentru a muta pagina în jos"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Schimbă butoanele stâng și drept"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Folosește butonul stâng al mouse-ului ca pe cel drept"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Comenzi rapide de la tastatură"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Afișează lista de comenzi rapide"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Tastaturi și instrumente pt. profilul de serviciu"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Alege o nouă tastă pentru <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Accesibilitatea tastaturii fizice"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Taste adezive, Taste nerepetate, Butoanele mouse-ului"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Aspectul <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Prestabilit"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Previzualizare"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Opțiuni standard"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Limbă"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Dimensiunea subtitrării"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Stilul subtitrării"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Opțiuni personalizate"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Culoare de fundal"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Vrei să te deconectezi de la această rețea VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Deconectează-te"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versiune"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Elimină profilul VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Înlocuiești rețeaua VPN existentă?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Setezi rețeaua VPN ca activată permanent?"</string>
@@ -5463,13 +5465,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Caută în setări"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"agendă, spațiu de stocare, cont"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Stocarea datelor din Agendă"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Numai pe dispozitiv"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Contactele noi nu se vor sincroniza cu un cont"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Persoanele de contact vor fi salvate pe dispozitiv și sincronizate cu contul în mod prestabilit"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Nicio setare prestabilită"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Adaugă un cont pentru a începe"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 8dd023f..6bc3ff7 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Портфель"</item>
-    <item msgid="184985872234062767">"Здание в классическом стиле"</item>
-    <item msgid="9189550412466785530">"Многоквартирный дом"</item>
-    <item msgid="2142527562511049422">"Выноска"</item>
-    <item msgid="2548100558260478605">"Группа людей"</item>
-    <item msgid="2270003903304578284">"Лампочка"</item>
-    <item msgid="4793496619091161864">"Календарь"</item>
-    <item msgid="5673625795644364100">"Не беспокоить"</item>
-    <item msgid="1423820834865831361">"Человек бежит"</item>
-    <item msgid="2037298830718732608">"Гольф"</item>
-    <item msgid="2197835014443491074">"Гантеля для спортзала"</item>
-    <item msgid="2730180105015616518">"Плавание"</item>
-    <item msgid="2666922823253345958">"Человек занимается пешим туризмом"</item>
-    <item msgid="8234880356472211396">"Человек бросает мяч"</item>
-    <item msgid="4642980625253001443">"Человек наносит удар"</item>
-    <item msgid="4324795269518833500">"Игровой контроллер"</item>
-    <item msgid="7789966425125441125">"Палитра художника"</item>
-    <item msgid="663512680597461570">"Снежинка"</item>
-    <item msgid="7952183800501346803">"Пляжный зонт"</item>
-    <item msgid="799139025758265891">"Инструменты в мастерской"</item>
-    <item msgid="1330084588359129896">"Палатка"</item>
-    <item msgid="3861584909935022342">"Кинопленка"</item>
-    <item msgid="5827426100157335512">"Книга"</item>
-    <item msgid="8585828346253128384">"Цветок лотоса"</item>
-    <item msgid="8788370542815300188">"Разум человека"</item>
-    <item msgid="7287354964767553293">"Наушники"</item>
-    <item msgid="2530059623783800987">"Телевизор"</item>
-    <item msgid="5307182323469376758">"Поезд"</item>
-    <item msgid="4903790544026923026">"Автомобиль"</item>
-    <item msgid="5010405583912314582">"Вилка и нож"</item>
-    <item msgid="8939998598599064900">"Корзина"</item>
-    <item msgid="3379605903308731893">"Ребенок"</item>
-    <item msgid="7808668968550293112">"Лапа животного"</item>
-    <item msgid="1000692647524056504">"Звездочка"</item>
-    <item msgid="8270261073421676502">"Два человека"</item>
-    <item msgid="5767782819651505460">"Звездочка"</item>
-    <item msgid="4368451291862729334">"Сердце"</item>
-    <item msgid="2613199102208419986">"Дом"</item>
-    <item msgid="3022279986430275040">"Полумесяц"</item>
-    <item msgid="5421089790869483206">"Часы"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 1492f90..3fe535d 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Устанавливать автоматически, используя сеть устройства и беспроводные сигналы"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Автоматическое определение часового пояса"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Устанавливать автоматически, используя мобильные сети поблизости"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Устанавливать автоматически, используя геолокацию. Может требоваться подключение к Wi-Fi."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Региональные настройки по умолчанию"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-часовой формат"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Время"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Специальные возможности"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Физическая клавиатура"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Контроль повторного нажатия"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Быстро повторяющиеся нажатия одной клавиши на клавиатуре будут игнорироваться"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Интервал между повторными нажатиями"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Выберите, в течение какого времени будут игнорироваться повторные нажатия клавиши на клавиатуре."</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2 сек."</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4 сек."</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0,6 сек."</string>
     <string name="slow_keys" msgid="2891452895499690837">"Медленные клавиши"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Настроить длительность интервала между нажатием клавиши и назначенным на нее действием"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Залипание клавиш"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Вместо того чтобы удерживать вместе все клавиши из сочетания, нажимайте их по одной"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Клавиши управления мышью"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Управлять указателем с помощью клавиатуры"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Прокручивать мышью в обратном направлении"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Если прокрутить вверх, страница прокрутится вниз"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Поменять местами левую и правую кнопки"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Использовать левую кнопку мыши в качестве правой"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Быстрые клавиши"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Показывать список сочетаний клавиш"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Клавиатуры и инструменты рабочего профиля"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Выберите новую клавишу для <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Специальные возможности для физической клавиатуры"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Залипание клавиш, контроль повторного нажатия, клавиши управления мышью"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Раскладка \"<xliff:g id="IME_LABEL">%s</xliff:g>\""</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"По умолчанию"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Предпросмотр"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Стандартные настройки"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Язык"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Размер субтитров"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Стиль субтитров"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Собственные настройки"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Цвет фона"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Отключиться от VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Да"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Версия"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Удалить VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Сменить текущую VPN-сеть?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Настроить постоянную VPN-сеть?"</string>
@@ -5464,13 +5466,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Поиск по настройкам"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"контакты, хранилище, аккаунт"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Контакты"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Только на устройстве"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Новые контакты не будут синхронизироваться с аккаунтом"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Контакты будут по умолчанию сохраняться на устройстве и синхронизироваться с аккаунтом"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Аккаунт по умолчанию не задан"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Сначала добавьте аккаунт"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-si/arrays.xml b/res/values-si/arrays.xml
index 907185d..391a9ea 100644
--- a/res/values-si/arrays.xml
+++ b/res/values-si/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"ලිපි කොපුව"</item>
-    <item msgid="184985872234062767">"සම්භාව්‍ය ගොඩනැඟිල්ල"</item>
-    <item msgid="9189550412466785530">"බද්ධනිවාස ගොඩනැඟිල්ල"</item>
-    <item msgid="2142527562511049422">"කථන බුබුළ"</item>
-    <item msgid="2548100558260478605">"පුද්ගල කණ්ඩායම"</item>
-    <item msgid="2270003903304578284">"විදුලි බුබුළ"</item>
-    <item msgid="4793496619091161864">"දින දර්ශනය"</item>
-    <item msgid="5673625795644364100">"බාධා නොකිරීම"</item>
-    <item msgid="1423820834865831361">"දුවන පුද්ගලයා"</item>
-    <item msgid="2037298830718732608">"ගොල්ෆ්"</item>
-    <item msgid="2197835014443491074">"ජිම් ඩම්බල්"</item>
-    <item msgid="2730180105015616518">"පිහිනීම"</item>
-    <item msgid="2666922823253345958">"කඳු නගින පුද්ගලයා"</item>
-    <item msgid="8234880356472211396">"පන්දුව විසි කරන පුද්ගලයා"</item>
-    <item msgid="4642980625253001443">"පයින් ගසන පුද්ගලයා"</item>
-    <item msgid="4324795269518833500">"ක්‍රීඩා පාලකය"</item>
-    <item msgid="7789966425125441125">"කලාකරුවන්ගේ වර්ණ තැටිය"</item>
-    <item msgid="663512680597461570">"හිම මල්"</item>
-    <item msgid="7952183800501346803">"වෙරළ කුඩය"</item>
-    <item msgid="799139025758265891">"වැඩමුළු මෙවලම්"</item>
-    <item msgid="1330084588359129896">"කූඩාරම"</item>
-    <item msgid="3861584909935022342">"සිනමා පටය"</item>
-    <item msgid="5827426100157335512">"පොත"</item>
-    <item msgid="8585828346253128384">"නෙළුම් මල"</item>
-    <item msgid="8788370542815300188">"පුද්ගලයාගේ මනස"</item>
-    <item msgid="7287354964767553293">"හෙඩ්ෆෝන්"</item>
-    <item msgid="2530059623783800987">"රූපවාහිනිය"</item>
-    <item msgid="5307182323469376758">"දුම්රිය"</item>
-    <item msgid="4903790544026923026">"මෝටර් රථය"</item>
-    <item msgid="5010405583912314582">"ගෑරුප්පුව සහ පිහිය"</item>
-    <item msgid="8939998598599064900">"සාප්පු කරත්තය"</item>
-    <item msgid="3379605903308731893">"ළමයා"</item>
-    <item msgid="7808668968550293112">"සත්ව පාදය"</item>
-    <item msgid="1000692647524056504">"තරු ලාංඡනය"</item>
-    <item msgid="8270261073421676502">"පුද්ගලයින් දෙදෙනෙක්"</item>
-    <item msgid="5767782819651505460">"තරුව"</item>
-    <item msgid="4368451291862729334">"හදවත"</item>
-    <item msgid="2613199102208419986">"මුල් පිටුව"</item>
-    <item msgid="3022279986430275040">"අර්ධ සඳ"</item>
-    <item msgid="5421089790869483206">"ඔරලෝසුව"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 0ff08b9..0c60780 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"ඔබේ ජාලය සහ රැහැන් රහිත සංඥා භාවිතයෙන් ස්වයංක්‍රීයව සකසන්න"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"ස්වයංක්‍රීය වේලා කලාපය"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"ඔබ අසල ඇති ජංගම ජාල මත පදනම්ව ස්වයංක්‍රීයව සකසන්න"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"තිබේ නම්, ඔබේ උපාංග ස්ථානය භාවිතයෙන් ස්වයංක්‍රීයව සකසන්න. සක්‍රිය Wifi සම්බන්ධතාවයක් ද අවශ්‍ය විය හැක."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"පෙදෙසි පෙරනිමි භාවිත කරන්න"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"පැය 24 ආකාරය භාවිත කරන්න"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"වේලාව"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"ප්‍රවේශ්‍යතාව"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"භෞතික යතුරු පුවරුව"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"පනින යතුරු"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"යතුරු පුවරුව එකම යතුර ඉක්මනින් නැවත නැවතත් එබීම නොසලකා හරියි"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"උඩ පනින යතුරු සීමාව"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"ඔබේ යතුරු පුවරුව නැවත නැවතත් යතුරු එබීම නොසලකා හරින කාල සීමාව තෝරා ගන්න"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"ත0.2"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"ත0.4"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"ත0.6"</string>
     <string name="slow_keys" msgid="2891452895499690837">"මන්දගාමී යතුරු"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"යතුරු එබීම සක්‍රිය වීම සඳහා එයට ගතවන කාලය සකසයි"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"ඇලෙන යතුරු"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"කෙටිමං සඳහා යතුරු එකට තබා ගැනීම වෙනුවට වරකට යතුරක් ඔබන්න"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"මූසික යතුරු"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"දර්ශකය පාලනය කිරීමට ඔබේ යතුරු පුවරුව භාවිතා කරන්න"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"මූසික ආපස්සට අනුචලනය"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"පිටුව පහළට ගෙන යාමට ඉහළට අනුචලන කරන්න"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"වම් සහ දකුණු බොත්තම් මාරු කරන්න"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"වම් මූසික බොත්තම ඔබේ දකුණ ලෙස භාවිතා කරන්න"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"යතුරු පුවරු කෙටිමං"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"කෙටිමං ලැයිස්තුව පෙන්වන්න"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"කාර්යාල පැතිකඩ යතුරු පුවරු සහ මෙවලම්"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> සඳහා නව යතුරක් තෝරා ගන්න:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"භෞතික යතුරුපුවරු ප්‍රවේශ්‍යතාව"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"ඇලෙන යතුරු, පනින යතුරු, මූසික යතුරු"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> පිරිසැලසුම"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"පෙරනිමි"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"පෙරදසුන"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"සාමාන්‍ය විකල්ප"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"භාෂාව"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"සිරස්තල ප්‍රමාණය"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"සිරස්තල මෝස්තරය"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"අභිරුචි විකල්ප"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"පසුබිම් වර්ණය"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"මෙම VPN එක විසන්ධි කරන්නද?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"විසන්ධි කරන්න"</string>
     <string name="vpn_version" msgid="6344167191984400976">"අනුවාදය"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN අමතක කරන්න"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"පවතින VPN ප්‍රතිස්ථාපනය කරන්නද?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"සැම විට ක්‍රියාත්මක VPN සකසන්නද?"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"සෙවීමේ සැකසීම්"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"සම්බන්ධතා, ආචයනය, ගිණුම"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"සම්බන්ධතා ආචයනය"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"උපාංගය පමණි"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"නව සම්බන්ධතා ගිණුමක් සමග සමමුහුර්ත නොවනු ඇත"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"සම්බන්ධතා ඔබේ උපාංගයට සුරකිනු ඇති අතර පෙරනිමියෙන් ඔබේ ගිණුමට සමමුහුර්ත කරනු ලැබේ"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"පෙරනිමි සැකසීමක් නැත"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"පටන් ගැනීමට ගිණුමක් එක් කරන්න"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index be2683c..d551fd3 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Kufrík"</item>
-    <item msgid="184985872234062767">"Klasická budova"</item>
-    <item msgid="9189550412466785530">"Bytový dom"</item>
-    <item msgid="2142527562511049422">"Rečová bublina"</item>
-    <item msgid="2548100558260478605">"Skupina ľudí"</item>
-    <item msgid="2270003903304578284">"Žiarovka"</item>
-    <item msgid="4793496619091161864">"Kalendár"</item>
-    <item msgid="5673625795644364100">"Režim bez vyrušení"</item>
-    <item msgid="1423820834865831361">"Bežiaca osoba"</item>
-    <item msgid="2037298830718732608">"Golf"</item>
-    <item msgid="2197835014443491074">"Činka"</item>
-    <item msgid="2730180105015616518">"Plávanie"</item>
-    <item msgid="2666922823253345958">"Osoba na túre"</item>
-    <item msgid="8234880356472211396">"Osoba, ktorá hádže loptu"</item>
-    <item msgid="4642980625253001443">"Osoba, ktorá kope"</item>
-    <item msgid="4324795269518833500">"Herný ovládač"</item>
-    <item msgid="7789966425125441125">"Maliarova paleta farieb"</item>
-    <item msgid="663512680597461570">"Snehová vločka"</item>
-    <item msgid="7952183800501346803">"Plážový slnečník"</item>
-    <item msgid="799139025758265891">"Nástroje v dielni"</item>
-    <item msgid="1330084588359129896">"Stan"</item>
-    <item msgid="3861584909935022342">"Filmový pásik"</item>
-    <item msgid="5827426100157335512">"Kniha"</item>
-    <item msgid="8585828346253128384">"Lotosový kvet"</item>
-    <item msgid="8788370542815300188">"Ľudská myseľ"</item>
-    <item msgid="7287354964767553293">"Slúchadlá"</item>
-    <item msgid="2530059623783800987">"Televízor"</item>
-    <item msgid="5307182323469376758">"Vlak"</item>
-    <item msgid="4903790544026923026">"Auto"</item>
-    <item msgid="5010405583912314582">"Vidlička a nôž"</item>
-    <item msgid="8939998598599064900">"Nákupný košík"</item>
-    <item msgid="3379605903308731893">"Dieťa"</item>
-    <item msgid="7808668968550293112">"Zvieracia labka"</item>
-    <item msgid="1000692647524056504">"Odznak hviezdičky"</item>
-    <item msgid="8270261073421676502">"Dvaja ľudia"</item>
-    <item msgid="5767782819651505460">"Hviezda"</item>
-    <item msgid="4368451291862729334">"Srdce"</item>
-    <item msgid="2613199102208419986">"Dom"</item>
-    <item msgid="3022279986430275040">"Polmesiac"</item>
-    <item msgid="5421089790869483206">"Hodiny"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 443c944..2e7ac3a 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Nastavujte automaticky pomocou sieťových a bezdrôtových signálov"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Automatické časové pásmo"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Nastavujte automaticky na základe mobilných sietí v okolí"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Nastavujte automaticky pomocou polohy zariadenia, ak je k dispozícii. Môže sa vyžadovať aj aktívne pripojenie Wi‑Fi."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Používať miestny predvolený formát"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Používať 24-hodinový formát"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Čas"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Dostupnosť"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Fyzická klávesnica"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Klávesy jedného stlačenia"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Klávesnica ignoruje rýchle opakované stlačenia rovnakého klávesa"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Prah opakovaného stlačenia"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Vyberte, ako dlho má klávesnica ignorovať opakované stláčanie klávesov"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2 s"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4 s"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0,6 s"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Pomalé klávesy"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Upravuje čas aktivácie po stlačení klávesa"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Režim uzamknutia klávesa"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Používať skratky stlačením jedného klávesa namiesto viacerých"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Klávesy myši"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Ovládajte kurzor pomocou klávesnice"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Obrátené posúvanie myšou"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Prechádzajte po stránke nadol posúvaním myši nahor"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Vymeniť ľavé a pravé tlačidlo"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Používajte ľavé tlačidlo myši ako pravé"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Klávesové skratky"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Zobraziť zoznam skratiek"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Klávesnice a nástroje pracovného profilu"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Vyberte pre <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> nový kláves:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Dostupnosť fyzickej klávesnice"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Režim uzamknutia klávesa, klávesy jedného stlačenia, klávesy myši"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Rozloženie <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Predvolené"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Ukážka"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Štandardné možnosti"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Jazyk"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Veľkosť titulkov"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Štýl titulkov"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Vlastné možnosti"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Farba pozadia"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Odpojiť tento profil VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Odpojiť"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Verzia"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Zabudnúť profil VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Nahradiť existujúcu sieť VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Nastaviť sieť VPN, ktorá je vždy zapnutá?"</string>
@@ -5464,13 +5466,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Vyhľadávať v nastaveniach"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"kontakty, priestor, účet"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Úložisko kontaktov"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Len senzory zariadenia"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Nové kontakty sa s účtom nebudú synchronizovať"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kontakty sa budú predvolene ukladať do zariadenia a synchronizovať s účtom"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Nie je nastavená žiadna predvolená hodnota"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Začnite pridaním účtu"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index c368aef..9c1723e 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Aktovka"</item>
-    <item msgid="184985872234062767">"Klasična stavba"</item>
-    <item msgid="9189550412466785530">"Stanovanjski objekt"</item>
-    <item msgid="2142527562511049422">"Oblaček z govorom"</item>
-    <item msgid="2548100558260478605">"Skupina oseb"</item>
-    <item msgid="2270003903304578284">"Žarnica"</item>
-    <item msgid="4793496619091161864">"Koledar"</item>
-    <item msgid="5673625795644364100">"Ne moti"</item>
-    <item msgid="1423820834865831361">"Oseba teče"</item>
-    <item msgid="2037298830718732608">"Golf"</item>
-    <item msgid="2197835014443491074">"Telovadna utežna ročka"</item>
-    <item msgid="2730180105015616518">"Plavanje"</item>
-    <item msgid="2666922823253345958">"Oseba na pohodu"</item>
-    <item msgid="8234880356472211396">"Oseba meče žogo"</item>
-    <item msgid="4642980625253001443">"Oseba brca"</item>
-    <item msgid="4324795269518833500">"Krmilnik za igre"</item>
-    <item msgid="7789966425125441125">"Barvna paleta umetnika"</item>
-    <item msgid="663512680597461570">"Snežinka"</item>
-    <item msgid="7952183800501346803">"Senčnik"</item>
-    <item msgid="799139025758265891">"Orodja v delavnici"</item>
-    <item msgid="1330084588359129896">"Šotor"</item>
-    <item msgid="3861584909935022342">"Filmski trak"</item>
-    <item msgid="5827426100157335512">"Knjiga"</item>
-    <item msgid="8585828346253128384">"Lotosov cvet"</item>
-    <item msgid="8788370542815300188">"Misli osebe"</item>
-    <item msgid="7287354964767553293">"Slušalke"</item>
-    <item msgid="2530059623783800987">"Televizor"</item>
-    <item msgid="5307182323469376758">"Vlak"</item>
-    <item msgid="4903790544026923026">"Avtomobil"</item>
-    <item msgid="5010405583912314582">"Vilice in nož"</item>
-    <item msgid="8939998598599064900">"Nakupovalni voziček"</item>
-    <item msgid="3379605903308731893">"Otrok"</item>
-    <item msgid="7808668968550293112">"Živalska šapa"</item>
-    <item msgid="1000692647524056504">"Značka zvezdice"</item>
-    <item msgid="8270261073421676502">"Dve osebi"</item>
-    <item msgid="5767782819651505460">"Zvezda"</item>
-    <item msgid="4368451291862729334">"Srce"</item>
-    <item msgid="2613199102208419986">"Hiša"</item>
-    <item msgid="3022279986430275040">"Polmesec"</item>
-    <item msgid="5421089790869483206">"Ura"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index f56f457..bb538c9 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Samodejna nastavitev na podlagi omrežja in brezžičnih signalov"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Samodejni časovni pas"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Samodejna nastavitev na podlagi mobilnih omrežij v bližini"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Samodejna nastavitev na podlagi lokacije naprave, če je na voljo. Morda bo potrebna tudi aktivna povezava Wi-Fi."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Uporabi privzete območne nastavitve"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Uporabi 24-urni zapis časa"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Ura"</string>
@@ -1947,7 +1948,7 @@
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Fizična tipkovnica"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Zaznava večkratnih pritiskov tipk"</string>
     <string name="bounce_keys_summary" msgid="7418024428905737729">"Tipkovnica prezre hitro ponovljene pritiske iste tipke"</string>
-    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Prag za prezrtje hitrih zaporednih pritiskov tipk"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Prag za prezrtje pritiskov tipk"</string>
     <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Izberite, kako dolgo tipkovnica prezre ponovljene pritiske tipk"</string>
     <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2 s"</string>
     <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4 s"</string>
@@ -1958,6 +1959,10 @@
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Za bližnjice pritisnite eno tipko hkrati namesto več tipk hkrati"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Tipke za miško"</string>
     <string name="mouse_keys_summary" msgid="7030731235143286467">"Upravljanje kazalke s tipkovnico"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Obratno pomikanje z miško"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Pomaknite se navzgor, če želite premakniti stran navzdol"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Zamenjava levega in desnega gumba"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Uporabljajte levi gumb na miški kot desnega"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Bližnjične tipke"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Prikaz seznama bližnjic"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Tipkovnice in orodja delovnega profila"</string>
@@ -2026,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Izberite novo tipko za »<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>«:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Dostopnost fizične tipkovnice"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Zaklepanje tipk, zaznava večkratnih pritiskov tipk, tipke za miško"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Postavitev <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Privzeto"</string>
@@ -2434,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Predogled"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standardne možnosti"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Jezik"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Velikost podnapisov"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Slog podnapisov"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Možnosti po meri"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Barva ozadja"</string>
@@ -2979,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Prekinitev povezave s tem omrežjem VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Prekini povezavo"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Različica"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Pozabi omrežje VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Želite zamenjati obstoječe omrežje VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Ali želite, da je omrežje VPN stalno vklopljeno?"</string>
@@ -5461,4 +5471,8 @@
     <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Stiki bodo privzeto shranjeni v napravi in sinhronizirani z računom"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Nastavljen ni noben privzeti račun"</string>
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Za začetek dodajte račun"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
+    <skip />
 </resources>
diff --git a/res/values-sq/arrays.xml b/res/values-sq/arrays.xml
index 2450b85..54acf02 100644
--- a/res/values-sq/arrays.xml
+++ b/res/values-sq/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Valixhe"</item>
-    <item msgid="184985872234062767">"Ndërtesë klasike"</item>
-    <item msgid="9189550412466785530">"Ndërtesë me apartamente"</item>
-    <item msgid="2142527562511049422">"Flluskë bisede"</item>
-    <item msgid="2548100558260478605">"Grup personash"</item>
-    <item msgid="2270003903304578284">"Llambë"</item>
-    <item msgid="4793496619091161864">"Kalendar"</item>
-    <item msgid="5673625795644364100">"Mos shqetëso"</item>
-    <item msgid="1423820834865831361">"Person duke vrapuar"</item>
-    <item msgid="2037298830718732608">"Golf"</item>
-    <item msgid="2197835014443491074">"Girë palestre"</item>
-    <item msgid="2730180105015616518">"Not"</item>
-    <item msgid="2666922823253345958">"Person në ekskursion"</item>
-    <item msgid="8234880356472211396">"Person duke hedhur topin"</item>
-    <item msgid="4642980625253001443">"Person duke shkelmuar"</item>
-    <item msgid="4324795269518833500">"Kontrolluesi i lojës"</item>
-    <item msgid="7789966425125441125">"Paleta e ngjyrave e artistit"</item>
-    <item msgid="663512680597461570">"Flok dëbore"</item>
-    <item msgid="7952183800501346803">"Çadër plazhi"</item>
-    <item msgid="799139025758265891">"Vegla punishteje"</item>
-    <item msgid="1330084588359129896">"Tendë"</item>
-    <item msgid="3861584909935022342">"Bobina e filmit"</item>
-    <item msgid="5827426100157335512">"Libër"</item>
-    <item msgid="8585828346253128384">"Zambak uji"</item>
-    <item msgid="8788370542815300188">"Mendja e një personi"</item>
-    <item msgid="7287354964767553293">"Kufje"</item>
-    <item msgid="2530059623783800987">"Televizor"</item>
-    <item msgid="5307182323469376758">"Tren"</item>
-    <item msgid="4903790544026923026">"Makinë"</item>
-    <item msgid="5010405583912314582">"Pirun dhe thikë"</item>
-    <item msgid="8939998598599064900">"Karroca e blerjes"</item>
-    <item msgid="3379605903308731893">"Fëmijë"</item>
-    <item msgid="7808668968550293112">"Putër kafshe"</item>
-    <item msgid="1000692647524056504">"Stema e yllit"</item>
-    <item msgid="8270261073421676502">"Dy persona"</item>
-    <item msgid="5767782819651505460">"Yll"</item>
-    <item msgid="4368451291862729334">"Zemër"</item>
-    <item msgid="2613199102208419986">"Shtëpi"</item>
-    <item msgid="3022279986430275040">"Gjysmëhënë"</item>
-    <item msgid="5421089790869483206">"Orë"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index f736eb1..8c5199e 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Cakto automatikisht duke përdorur sinjalet e rrjetit dhe ato wireless"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Brezi orar automatik"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Cakto automatikisht bazuar në rrjetet celulare pranë teje"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Cakto automatikisht duke përdorur vendndodhjen e pajisjes sate, nëse ofrohet. Mund të kërkohet gjithashtu një lidhje aktive Wifi."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Përdor parazgjedhjen e lokalitetit"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Përdor formatin 24-orësh"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Ora"</string>
@@ -659,12 +660,9 @@
     <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Cakto motiv për hapësirën private"</string>
     <string name="private_space_category_lock" msgid="1917657024358778169">"Kyç"</string>
     <string name="private_space_category_hide" msgid="3236587591523126649">"Fshih"</string>
-    <!-- no translation found for private_space_confirm_your_pattern_header (449382220134788771) -->
-    <skip />
-    <!-- no translation found for private_space_confirm_your_pin_header (4543332157470087796) -->
-    <skip />
-    <!-- no translation found for private_space_confirm_your_password_header (9202308075814307169) -->
-    <skip />
+    <string name="private_space_confirm_your_pattern_header" msgid="449382220134788771">"Konfirmo motivin e hapësirës sate private"</string>
+    <string name="private_space_confirm_your_pin_header" msgid="4543332157470087796">"Fut përsëri kodin PIN të hapësirës sate private"</string>
+    <string name="private_space_confirm_your_password_header" msgid="9202308075814307169">"Fut përsëri fjalëkalimin e hapësirës sate private"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Mund të shtosh deri në <xliff:g id="COUNT">%d</xliff:g> gjurmë gishtash"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Ke shtuar numrin maksimal të gjurmëve të gishtave"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Nuk mund të shtohen gjurmë të tjera të gishtave"</string>
@@ -1032,10 +1030,8 @@
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Kontrollo fjalëkalimin dhe provo përsëri"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Kontakto me prodhuesin e pajisjes"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Kontrollo lidhjen dhe provo përsëri"</string>
-    <!-- no translation found for wifi_dpp_check_connection_no_matched_ssid (3608318690698685427) -->
-    <skip />
-    <!-- no translation found for wifi_dpp_check_connection_no_matched_security (1462706753123341376) -->
-    <skip />
+    <string name="wifi_dpp_check_connection_no_matched_ssid" msgid="3608318690698685427">"Ky rrjet Wi‑Fi nuk ofrohet për momentin"</string>
+    <string name="wifi_dpp_check_connection_no_matched_security" msgid="1462706753123341376">"Ka një problem me këtë kod QR. Provo të lidhesh në një mënyrë tjetër."</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Zgjidh rrjetin"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"Për të lidhur pajisjen, zgjidh një rrjet"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Të shtohet kjo pajisje te “<xliff:g id="SSID">%1$s</xliff:g>”?"</string>
@@ -1971,6 +1967,10 @@
     <string name="mouse_keys" msgid="6237254627808525540">"Butonat e miut"</string>
     <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
     <skip />
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Lëvizja e miut në të kundërt"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Lëviz lart për ta zhvendosur faqen poshtë"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Ndërro butonin e majtë dhe të djathtë"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Përdor butonin e majtë të miut si buton të djathtë"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Shkurtoret e tastierës"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Shfaq listën e shkurtoreve"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Tastierat dhe veglat e profilit të punës"</string>
@@ -2039,9 +2039,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Zgjidh një çelës të ri për <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Qasshmëria për tastierën fizike"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Tastet e përhershme, tastet e përsëritura, tastet e miut"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Struktura e <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"E parazgjedhur"</string>
@@ -2447,8 +2451,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Shikim paraprak"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Opsionet standarde"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Gjuha"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Madhësia e titrave"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Stili i titrave"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Personalizo opsionet"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Ngjyra e sfondit"</string>
@@ -2992,6 +2995,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Shkëpute këtë rrjet VPN"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Shkëpute"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versioni"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Harroje rrjetin VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Të zëvendësohet rrjeti ekzistues VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Të caktohet rrjeti VPN gjithmonë aktiv?"</string>
@@ -3924,8 +3929,7 @@
     <string name="zen_mode_new_custom_title" msgid="7513785385574267851">"Krijo një modalitet"</string>
     <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Modaliteti i personalizuar"</string>
     <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Emri i modalitetit"</string>
-    <!-- no translation found for zen_mode_edit_name_empty_error (5788063278827188275) -->
-    <skip />
+    <string name="zen_mode_edit_name_empty_error" msgid="5788063278827188275">"Emri i modalitetit nuk mund të jetë bosh"</string>
     <string name="zen_mode_edit_choose_icon_title" msgid="6452801577128788362">"Zgjidh një ikonë"</string>
     <string name="zen_mode_trigger_title_schedule_calendar" msgid="9206609438617550331">"Ngjarjet e kalendarit"</string>
     <string name="zen_mode_trigger_title_bedtime" msgid="3287241454965736913">"Rutina e orarit të gjumit"</string>
@@ -5477,4 +5481,8 @@
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Nuk është caktuar asnjë e parazgjedhur"</string>
     <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
     <skip />
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
+    <skip />
 </resources>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 2484fbf..f1cea2b 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Актовка"</item>
-    <item msgid="184985872234062767">"Класична зграда"</item>
-    <item msgid="9189550412466785530">"Стамбена зграда"</item>
-    <item msgid="2142527562511049422">"Облачић"</item>
-    <item msgid="2548100558260478605">"Група људи"</item>
-    <item msgid="2270003903304578284">"Сијалица"</item>
-    <item msgid="4793496619091161864">"Календар"</item>
-    <item msgid="5673625795644364100">"Не узнемиравај"</item>
-    <item msgid="1423820834865831361">"Особа која трчи"</item>
-    <item msgid="2037298830718732608">"Голф"</item>
-    <item msgid="2197835014443491074">"Тег за теретану"</item>
-    <item msgid="2730180105015616518">"Пливање"</item>
-    <item msgid="2666922823253345958">"Особа која пешачи"</item>
-    <item msgid="8234880356472211396">"Особа која баца лопту"</item>
-    <item msgid="4642980625253001443">"Особа која шутира"</item>
-    <item msgid="4324795269518833500">"Контролер за игре"</item>
-    <item msgid="7789966425125441125">"Палета боја уметника"</item>
-    <item msgid="663512680597461570">"Пахуља"</item>
-    <item msgid="7952183800501346803">"Сунцобран"</item>
-    <item msgid="799139025758265891">"Алат из радионице"</item>
-    <item msgid="1330084588359129896">"Шатор"</item>
-    <item msgid="3861584909935022342">"Ролна филма"</item>
-    <item msgid="5827426100157335512">"Књига"</item>
-    <item msgid="8585828346253128384">"Цвет лотоса"</item>
-    <item msgid="8788370542815300188">"Људски мозак"</item>
-    <item msgid="7287354964767553293">"Слушалице"</item>
-    <item msgid="2530059623783800987">"ТВ"</item>
-    <item msgid="5307182323469376758">"Воз"</item>
-    <item msgid="4903790544026923026">"Аутомобил"</item>
-    <item msgid="5010405583912314582">"Виљушка и нож"</item>
-    <item msgid="8939998598599064900">"Колица за куповину"</item>
-    <item msgid="3379605903308731893">"Дете"</item>
-    <item msgid="7808668968550293112">"Шапа животиње"</item>
-    <item msgid="1000692647524056504">"Значка са звездицом"</item>
-    <item msgid="8270261073421676502">"Две особе"</item>
-    <item msgid="5767782819651505460">"Звезда"</item>
-    <item msgid="4368451291862729334">"Срце"</item>
-    <item msgid="2613199102208419986">"Кућа"</item>
-    <item msgid="3022279986430275040">"Полумесец"</item>
-    <item msgid="5421089790869483206">"Сат"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 63bda44..922dd81 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Аутоматско подешавање помоћу мреже и бежичних сигнала"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Аутоматска временска зона"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Аутоматско подешавање на основу мобилних мрежа у близини"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Аутоматско подешавање помоћу локације уређаја, ако је доступна. Можда је потребна и активна WiFi веза."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Користи подразумевану вредност за локалитет"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Користи 24-часовни формат"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Време"</string>
@@ -1958,6 +1959,10 @@
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Притискајте један по један тастер да бисте користили пречице уместо да истовремено држите тастере"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Тастери миша"</string>
     <string name="mouse_keys_summary" msgid="7030731235143286467">"Контролишите показивач помоћу тастатуре"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Обрнуто скроловање мишем"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Скролујте нагоре да бисте померили страницу надоле"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Замените дугмад налево и надесно"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Користите леви тастер миша као десни"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Тастерске пречице"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Приказује листу пречица"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Тастатуре и алатке за пословни профил"</string>
@@ -2026,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Одаберите нови тастер за <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Приступачност физичке тастатуре"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Лепљиви тастери, дужи одзив тастера, тастери миша"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Распоред <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Подразумевано"</string>
@@ -2434,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Преглед"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Стандардне опције"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Језик"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Величина титла"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Стил титла"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Прилагођене опције"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Боја позадине"</string>
@@ -2979,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Желите ли да прекинете везу са овим VPN-ом?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Прекини везу"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Верзија"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Заборави VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Желите ли да замените постојећи VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Желите ли да подесите увек укључени VPN?"</string>
@@ -5460,4 +5470,8 @@
     <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Контакти се подразумевано чувају на уређају и синхронизују са налогом"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Није подешен подразумевани налог"</string>
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Додајте налог да бисте започели"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
+    <skip />
 </resources>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index 84665cb..5878b60 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Portfölj"</item>
-    <item msgid="184985872234062767">"Klassisk byggnad"</item>
-    <item msgid="9189550412466785530">"Hyreshus"</item>
-    <item msgid="2142527562511049422">"Pratbubbla"</item>
-    <item msgid="2548100558260478605">"En grupp människor"</item>
-    <item msgid="2270003903304578284">"Glödlampa"</item>
-    <item msgid="4793496619091161864">"Kalender"</item>
-    <item msgid="5673625795644364100">"Stör ej"</item>
-    <item msgid="1423820834865831361">"Person som springer"</item>
-    <item msgid="2037298830718732608">"Golf"</item>
-    <item msgid="2197835014443491074">"Gymhantel"</item>
-    <item msgid="2730180105015616518">"Simning"</item>
-    <item msgid="2666922823253345958">"Person som vandrar"</item>
-    <item msgid="8234880356472211396">"Person som kastar boll"</item>
-    <item msgid="4642980625253001443">"Person som sparkar"</item>
-    <item msgid="4324795269518833500">"Spelkontroll"</item>
-    <item msgid="7789966425125441125">"Färgpalett för konstnär"</item>
-    <item msgid="663512680597461570">"Snöflinga"</item>
-    <item msgid="7952183800501346803">"Strandparasoll"</item>
-    <item msgid="799139025758265891">"Verktyg"</item>
-    <item msgid="1330084588359129896">"Tält"</item>
-    <item msgid="3861584909935022342">"Filmrulle"</item>
-    <item msgid="5827426100157335512">"Bok"</item>
-    <item msgid="8585828346253128384">"Lotusblomma"</item>
-    <item msgid="8788370542815300188">"Persons sinne"</item>
-    <item msgid="7287354964767553293">"Hörlurar"</item>
-    <item msgid="2530059623783800987">"Tv"</item>
-    <item msgid="5307182323469376758">"Tåg"</item>
-    <item msgid="4903790544026923026">"Bil"</item>
-    <item msgid="5010405583912314582">"Gaffel och kniv"</item>
-    <item msgid="8939998598599064900">"Kundvagn"</item>
-    <item msgid="3379605903308731893">"Barn"</item>
-    <item msgid="7808668968550293112">"Djurtass"</item>
-    <item msgid="1000692647524056504">"Stjärnmärke"</item>
-    <item msgid="8270261073421676502">"Två personer"</item>
-    <item msgid="5767782819651505460">"Stjärna"</item>
-    <item msgid="4368451291862729334">"Hjärta"</item>
-    <item msgid="2613199102208419986">"House"</item>
-    <item msgid="3022279986430275040">"Halvmåne"</item>
-    <item msgid="5421089790869483206">"Klocka"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 811bed8..43fa809 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Ställ in automatiskt med nätverk och trådlösa signaler"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Automatisk tidszon"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Ställ in automatiskt utifrån mobilnätverk i närheten"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Ställ in automatiskt med enhetens plats, om tillgängligt. En aktiv wifi-anslutning kan också krävas."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Använd lokal standard"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Använd 24-timmarsformat"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Tid"</string>
@@ -1958,6 +1959,10 @@
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Tryck ned en tangent i taget för kortkommandon i stället för att hålla ned flera tangenter samtidigt"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Musknappar"</string>
     <string name="mouse_keys_summary" msgid="7030731235143286467">"Använd tangentbordet för att styra pekaren"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Omvänd scrollning på musen"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Scrolla uppåt för att flytta sidan nedåt"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Byt plats på vänster och höger knapp"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Använd vänster musknapp som höger"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Kortkommandon"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Visa en lista över genvägar"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Tangentbord och verktyg för jobbprofilen"</string>
@@ -2026,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Välj en ny tangent för <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Tillgänglighet för fysiskt tangentbord"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Låstangentsläge, studsande tangenter, musknappar"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Layouten <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Standard"</string>
@@ -2434,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Förhandsgranskning"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standardalternativ"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Språk"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Teckenstorlek för textning"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Textstil"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Anpassade alternativ"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Bakgrundsfärg"</string>
@@ -2979,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Vill du koppla från VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Koppla från"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Version"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Glöm VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Vill du byta ut befintligt VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Vill du ställa in Alltid på-VPN?"</string>
@@ -5459,4 +5469,8 @@
     <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kontakter sparas på enheten och synkroniseras med kontot som standard"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Ingen standardinställning har angetts"</string>
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Lägg till ett konto för att komma igång"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
+    <skip />
 </resources>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index 94e3abc..f1aa49e 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Mkoba"</item>
-    <item msgid="184985872234062767">"Jengo la zamani"</item>
-    <item msgid="9189550412466785530">"Jengo la fleti"</item>
-    <item msgid="2142527562511049422">"Kiputo cha maneno"</item>
-    <item msgid="2548100558260478605">"Kikundi cha watu"</item>
-    <item msgid="2270003903304578284">"Balbu ya umeme"</item>
-    <item msgid="4793496619091161864">"Kalenda"</item>
-    <item msgid="5673625795644364100">"Usinisumbue"</item>
-    <item msgid="1423820834865831361">"Mtu anayekimbia"</item>
-    <item msgid="2037298830718732608">"Gofu"</item>
-    <item msgid="2197835014443491074">"Vyuma vya mazoezi"</item>
-    <item msgid="2730180105015616518">"Kuogelea"</item>
-    <item msgid="2666922823253345958">"Mtu anayekwea mlima"</item>
-    <item msgid="8234880356472211396">"Mtu anayerusha mpira"</item>
-    <item msgid="4642980625253001443">"Mtu anayepiga teke"</item>
-    <item msgid="4324795269518833500">"Kidhibiti cha mchezo"</item>
-    <item msgid="7789966425125441125">"Safu ya rangi ya msanii"</item>
-    <item msgid="663512680597461570">"Kipande kidogo sana cha theluji"</item>
-    <item msgid="7952183800501346803">"Mwamvuli wa ufukweni"</item>
-    <item msgid="799139025758265891">"Zana za karakana"</item>
-    <item msgid="1330084588359129896">"Hema"</item>
-    <item msgid="3861584909935022342">"Ukanda wa filamu"</item>
-    <item msgid="5827426100157335512">"Kitabu"</item>
-    <item msgid="8585828346253128384">"Ua la yungiyungi"</item>
-    <item msgid="8788370542815300188">"Mawazo ya mtu"</item>
-    <item msgid="7287354964767553293">"Vipokea sauti vya kichwani"</item>
-    <item msgid="2530059623783800987">"TV"</item>
-    <item msgid="5307182323469376758">"Treni"</item>
-    <item msgid="4903790544026923026">"Gari"</item>
-    <item msgid="5010405583912314582">"Uma na kisu"</item>
-    <item msgid="8939998598599064900">"Kikapu"</item>
-    <item msgid="3379605903308731893">"Mtoto"</item>
-    <item msgid="7808668968550293112">"Wayo wa mnyama mwenye makucha"</item>
-    <item msgid="1000692647524056504">"Beji ya nyota"</item>
-    <item msgid="8270261073421676502">"Watu wawili"</item>
-    <item msgid="5767782819651505460">"Nyota"</item>
-    <item msgid="4368451291862729334">"Moyo"</item>
-    <item msgid="2613199102208419986">"Nyumba"</item>
-    <item msgid="3022279986430275040">"Nusu-mwezi"</item>
-    <item msgid="5421089790869483206">"Saa"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 16042ee..6f3e3de 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Weka mipangilio otomatiki ukitumia mtandao wako na mawimbi ya simu za mkononi"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Mipangilio otomatiki ya saa za eneo"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Weka mipangilio otomatiki kulingana na mitandao ya simu iliyo karibu nawe"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Weka mipangilio otomatiki ukitumia data ya mahali kilipo kifaa chako, ikiwa inapatikana. Huenda pia ukahitaji muunganisho wa Wi-Fi unaotumika."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Tumia chaguomsingi la eneo"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Tumia mpangilio wa saa 24"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Saa"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Ufikivu"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Kibodi halisi"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Vitufe vinavyoduta"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Kibodi hupuuza vitendo vya kurudia kubonyeza kitufe kimoja haraka mara nyingi"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Upeo wa mibofyo inayopuuzwa"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Chagua kipindi cha muda ambao kibodi yako itapuuza vitendo vya kurudia kubonyeza kitufe kimoja"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"sekunde 0.2"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"sekunde 0.4"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"sekunde 0.6"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Vitufe vya polepole"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Hurekebisha muda unaochukua kitendo cha kubonyeza kitufe kuwasha"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Vitufe vinavyonata"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Bonyeza kitufe kimoja baada ya kingine ili upate njia za mkato badala ya kubonyeza na kushikilia vitufe kwa pamoja"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Vitufe vya kipanya"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Tumia kibodi yako kudhibiti kielekezi"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Kubadilisha mwelekeo wa kipanya"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Sogeza juu ili usogeze ukurasa chini"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Kubadilisha utendaji wa vitufe vya kulia na kushoto"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Tumia kitufe cha kushoto cha kipanya kutekeleza majukumu ya kitufe cha kulia"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Mikato ya kibodi"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Onyesha orodha ya njia za mkato"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Zana na kibodi za wasifu wa kazini"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Chagua kitufe kipya cha kurekebisha cha <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Zana za ufikivu kwenye kibodi halisi"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Vitufe vinavyonata, Vitufe vinavyodunda, Vitufe vya kipanya"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Muundo wa <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Chaguomsingi"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Chungulia kwanza"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Chaguo za kawaida"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Lugha"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Ukubwa wa manukuu"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Mtindo wa manukuu"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Chaguo maalum"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Rangi ya mandharinyuma"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Ungependa kuondoa VPN hii?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Kata muungnisho"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Toleo"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Ondoa VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Ungependa kubadilisha VPN iliyopo?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Ungependa kuweka VPN iliyowashwa kila mara?"</string>
@@ -3712,7 +3714,7 @@
     <string name="notification_polite_main_control_title" msgid="5812529809151927149">"Tumia mipangilio ya kutuliza arifa"</string>
     <string name="notification_polite_description" msgid="5497748284893832854">"Unapopokea arifa nyingi ndani ya muda mfupi, kifaa chako kitapunguza sauti na arifa kwa hadi dakika 2. Hali hii haitaathiri simu, kengele na mazungumzo ya kipaumbele. \n\nUnaweza kupata arifa ulizopokea wakati wa kutulizwa kwa arifa kwa kutelezesha kidole chini kutoka sehemu ya juu ya skrini."</string>
     <string name="notification_polite_work" msgid="8823596456640216391">"Tumia kwenye wasifu wa kazini"</string>
-    <string name="notification_polite_work_summary" msgid="5014189280132951378">"Inatumika kwa programu zenye wasifu wa kazini"</string>
+    <string name="notification_polite_work_summary" msgid="5014189280132951378">"Tumia kwenye programu za wasifu wa kazini"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Huduma za kisaidizi cha Uhalisia Pepe"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Hakuna programu zilizosakinishwa ambazo zinaweza kutekeleza huduma za kisaidizi cha Uhalisia Pepe."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Ungependa kuruhusu huduma za Uhalisia Pepe katika <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Mipangilio ya Utafutaji"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"anwani, nafasi ya hifadhi, akaunti"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Nafasi ya kuhifadhi ya anwani"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Kifaa tu"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Anwani mpya hazitasawazishwa kwenye akaunti"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Anwani zitahifadhiwa kwenye kifaa chako na kusawazishwa kwenye akaunti yako kwa chaguomsingi"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Hujaweka akaunti chaguomsingi"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Weka akaunti ili uanze"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-ta/arrays.xml b/res/values-ta/arrays.xml
index ae9eb40..9f13ca2 100644
--- a/res/values-ta/arrays.xml
+++ b/res/values-ta/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"பெட்டி"</item>
-    <item msgid="184985872234062767">"பழங்காலக் கட்டடம்"</item>
-    <item msgid="9189550412466785530">"அடுக்குமாடிக் கட்டடம்"</item>
-    <item msgid="2142527562511049422">"பேச்சுக் குமிழ்"</item>
-    <item msgid="2548100558260478605">"குழு"</item>
-    <item msgid="2270003903304578284">"பல்பு"</item>
-    <item msgid="4793496619091161864">"கேலெண்டர்"</item>
-    <item msgid="5673625795644364100">"தொந்தரவு செய்ய வேண்டாம்"</item>
-    <item msgid="1423820834865831361">"ஒருவர் ஓடுகிறார்"</item>
-    <item msgid="2037298830718732608">"கோல்ஃப்"</item>
-    <item msgid="2197835014443491074">"ஜிம் டம்பெல்"</item>
-    <item msgid="2730180105015616518">"நீச்சல்"</item>
-    <item msgid="2666922823253345958">"ஒருவர் மலையேறுகிறார்"</item>
-    <item msgid="8234880356472211396">"ஒரு நபர் பந்து வீசுகிறார்"</item>
-    <item msgid="4642980625253001443">"ஒருவர் உதைக்கிறார்"</item>
-    <item msgid="4324795269518833500">"கேம் கண்ட்ரோலர்"</item>
-    <item msgid="7789966425125441125">"கலைஞரின் வண்ணத் தட்டு"</item>
-    <item msgid="663512680597461570">"பனித்துகள்"</item>
-    <item msgid="7952183800501346803">"கடற்கரைக் குடை"</item>
-    <item msgid="799139025758265891">"பணிமனைக் கருவிகள்"</item>
-    <item msgid="1330084588359129896">"கூடாரம்"</item>
-    <item msgid="3861584909935022342">"திரைப்பட ரீல்"</item>
-    <item msgid="5827426100157335512">"புத்தகம்"</item>
-    <item msgid="8585828346253128384">"தாமரைப் பூ"</item>
-    <item msgid="8788370542815300188">"மனித மூளை"</item>
-    <item msgid="7287354964767553293">"ஹெட்ஃபோன்கள்"</item>
-    <item msgid="2530059623783800987">"டிவி"</item>
-    <item msgid="5307182323469376758">"ரயில்"</item>
-    <item msgid="4903790544026923026">"கார்"</item>
-    <item msgid="5010405583912314582">"முட்கரண்டியும் கத்தியும்"</item>
-    <item msgid="8939998598599064900">"ஷாப்பிங் கார்ட்"</item>
-    <item msgid="3379605903308731893">"பிள்ளை"</item>
-    <item msgid="7808668968550293112">"விலங்கின் பாதம்"</item>
-    <item msgid="1000692647524056504">"ஸ்டார் பேட்ஜ்"</item>
-    <item msgid="8270261073421676502">"இரண்டு நபர்கள்"</item>
-    <item msgid="5767782819651505460">"நட்சத்திரம்"</item>
-    <item msgid="4368451291862729334">"இதயம்"</item>
-    <item msgid="2613199102208419986">"வீடு"</item>
-    <item msgid="3022279986430275040">"பாதி நிலவு"</item>
-    <item msgid="5421089790869483206">"கடிகாரம்"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 8de8680..3467edd 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"உங்கள் நெட்வொர்க்கையும் வயர்லெஸ் சிக்னல்களையும் பயன்படுத்தி தானாகவே அமைக்கும்"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"நேர மண்டலத்தைத் தானாகவே கண்டறிதல்"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"உங்களுக்கு அருகிலுள்ள மொபைல் நெட்வொர்க்குகளின் அடிப்படையில் தானாகவே அமைக்கும்"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"கிடைத்தால், சாதன இருப்பிடம் மூலம் தானாகவே அமைக்கும். செயலிலுள்ள வைஃபை இணைப்பும் தேவைப்படலாம்."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"உள்ளூர் நேர வடிவத்தைப் பயன்படுத்து"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-மணிநேர வடிவமைப்பு"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"நேரம்"</string>
@@ -1958,6 +1959,10 @@
     <string name="sticky_keys_summary" msgid="1844953803625480623">"ஷார்ட்கட்களுக்கு பட்டன்களை ஒன்றாகப் பிடிப்பதற்குப் பதிலாக ஒரு நேரத்தில் ஒரு பட்டனை அழுத்தலாம்"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"மவுஸ் பட்டன்கள்"</string>
     <string name="mouse_keys_summary" msgid="7030731235143286467">"பாயிண்ட்டரைக் கட்டுப்படுத்த உங்கள் கீபோர்டைப் பயன்படுத்தலாம்"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"மவுஸ் ரிவர்ஸ் ஸ்க்ரோலிங்"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"பக்கத்தை மேலிருந்து கீழே நகர்த்த மவுஸை முன்னோக்கி ஸ்க்ரோல் செய்யலாம்"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"இடதுபுற மற்றும் வலதுபுற பட்டன்களை மாற்றுதல்"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"இடதுபுற மவுஸ் பட்டனை வலதுபுற பட்டனாகப் பயன்படுத்தலாம்"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"கீபோர்டு ஷார்ட்கட்கள்"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"ஷார்ட்கட்களின் பட்டியலைக் காட்டும்"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"பணிக் கணக்கிற்கான கீபோர்டுகள் &amp; கருவிகள்"</string>
@@ -2026,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>க்கு புதிய விசையை தேர்வுசெய்யலாம்:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"கீபோர்டுக்கான மாற்றுத்திறன் வசதி"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"ஸ்டிக்கி கீஸ், பவுன்ஸ் கீஸ், மவுஸ் கீஸ்"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> தளவமைப்பு"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"இயல்பு"</string>
@@ -2434,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"முன்னோட்டம்"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"நிலையான விருப்பங்கள்"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"மொழி"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"வ்சன எழுத்து வடிவ அளவு"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"வசனத்தின் நடை"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"பிரத்தியேக விருப்பங்கள்"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"பின்புல வண்ணம்"</string>
@@ -2979,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"VPNஐத் துண்டிக்கவா?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"தொடர்பைத் துண்டி"</string>
     <string name="vpn_version" msgid="6344167191984400976">"பதிப்பு"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"VPNஐ நீக்கு"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"தற்போதுள்ள VPNஐ மாற்றியமைக்கவா?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"எப்போதும் இயங்கும் VPNஐ அமைக்கவா?"</string>
@@ -5459,4 +5469,8 @@
     <string name="contacts_storage_selection_message" msgid="8082077300632059003">"இயல்பாகவே தொடர்புகள் உங்கள் சாதனத்தில் சேமிக்கப்படும், உங்கள் கணக்குடன் ஒத்திசைக்கப்படும்"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"இயல்புநிலையாக எதுவும் அமைக்கப்படவில்லை"</string>
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"தொடங்குவதற்கு ஒரு கணக்கைச் சேருங்கள்"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
+    <skip />
 </resources>
diff --git a/res/values-te/arrays.xml b/res/values-te/arrays.xml
index 6bc7266..92b9732 100644
--- a/res/values-te/arrays.xml
+++ b/res/values-te/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"బ్రీఫ్‌కేస్"</item>
-    <item msgid="184985872234062767">"క్లాసికల్ బిల్డింగ్"</item>
-    <item msgid="9189550412466785530">"అపార్ట్‌మెంట్ బిల్డింగ్"</item>
-    <item msgid="2142527562511049422">"స్పీచ్ బబుల్"</item>
-    <item msgid="2548100558260478605">"వ్యక్తుల గ్రూప్"</item>
-    <item msgid="2270003903304578284">"లైట్ బల్బ్"</item>
-    <item msgid="4793496619091161864">"క్యాలెండర్"</item>
-    <item msgid="5673625795644364100">"అంతరాయం కలిగించవద్దు"</item>
-    <item msgid="1423820834865831361">"పరుగెడుతున్న వ్యక్తి"</item>
-    <item msgid="2037298830718732608">"గోల్ఫ్"</item>
-    <item msgid="2197835014443491074">"జిమ్ డంబెల్"</item>
-    <item msgid="2730180105015616518">"స్విమ్మింగ్"</item>
-    <item msgid="2666922823253345958">"హైకింగ్ చేస్తున్న వ్యక్తి"</item>
-    <item msgid="8234880356472211396">"బంతిని విసిరేస్తున్న వ్యక్తి"</item>
-    <item msgid="4642980625253001443">"కికింగ్ చేస్తున్న వ్యక్తి"</item>
-    <item msgid="4324795269518833500">"గేమ్ కంట్రోలర్"</item>
-    <item msgid="7789966425125441125">"ఆర్టిస్ట్ రంగుల పాలెట్"</item>
-    <item msgid="663512680597461570">"స్నోఫ్లేక్"</item>
-    <item msgid="7952183800501346803">"బీచ్ గొడుగు"</item>
-    <item msgid="799139025758265891">"వర్క్‌షాప్ టూల్స్"</item>
-    <item msgid="1330084588359129896">"టెంట్"</item>
-    <item msgid="3861584909935022342">"ఫిల్మ్ రీల్"</item>
-    <item msgid="5827426100157335512">"పుస్తకం"</item>
-    <item msgid="8585828346253128384">"తామర పువ్వు"</item>
-    <item msgid="8788370542815300188">"వ్యక్తి మైండ్"</item>
-    <item msgid="7287354964767553293">"హెడ్‌ఫోన్స్"</item>
-    <item msgid="2530059623783800987">"టీవీ"</item>
-    <item msgid="5307182323469376758">"రైలు"</item>
-    <item msgid="4903790544026923026">"కారు"</item>
-    <item msgid="5010405583912314582">"ఫోర్క్, కత్తి"</item>
-    <item msgid="8939998598599064900">"షాపింగ్ కార్ట్"</item>
-    <item msgid="3379605903308731893">"చైల్డ్"</item>
-    <item msgid="7808668968550293112">"జంతువుల పాదముద్ర"</item>
-    <item msgid="1000692647524056504">"స్టార్ బ్యాడ్జ్"</item>
-    <item msgid="8270261073421676502">"ఇద్దరు వ్యక్తులు"</item>
-    <item msgid="5767782819651505460">"స్టార్"</item>
-    <item msgid="4368451291862729334">"హార్ట్"</item>
-    <item msgid="2613199102208419986">"హౌస్"</item>
-    <item msgid="3022279986430275040">"అర్ధ చంద్రాకారం"</item>
-    <item msgid="5421089790869483206">"గడియారం"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 83a4e86..c7d392b 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"మీ నెట్‌వర్క్, వైర్‌లెస్ సిగ్నల్స్‌ను ఉపయోగించి ఆటోమేటిక్‌గా సెట్ చేయండి"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"ఆటోమేటిక్ టైమ్ జోన్"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"మీకు దగ్గరలో ఉన్న మొబైల్ నెట్‌వర్క్‌ల ఆధారంగా ఆటోమేటిక్‌గా సెట్ చేయబడింది"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"అందుబాటులో ఉంటే, మీ పరికర లొకేషన్‌తో ఆటోమేటిక్‌గా సెట్ చేయండి. యాక్టివ్ Wi-Fi కనెక్షన్ కూడా అవసరం."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"ఈ భాష‌లో వాడే ఫార్మాట్‌ను ఆటోమేటిక్‌ సెట్టింగ్‌గా ఉప‌యోగించండి"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-గంటల ఫార్మాట్‌ను ఉప‌యోగించండి"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"సమయం"</string>
@@ -1958,6 +1959,10 @@
     <string name="sticky_keys_summary" msgid="1844953803625480623">"షార్ట్‌కట్‌ల కోసం కీలను కలిపి హోల్డ్ చేయడానికి బదులు ఒకసారి ఒక కీని నొక్కండి"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"మౌస్ కీలు"</string>
     <string name="mouse_keys_summary" msgid="7030731235143286467">"మీ కీబోర్డ్‌ను ఉపయోగించి పాయింటర్‌ను కంట్రోల్ చేయండి"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"మౌస్ రివర్స్ స్క్రోలింగ్"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"పేజీని కిందికి కదిలించడానికి పైకి స్క్రోల్ చేయండి"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"ఎడమ, కుడి బటన్‌లను మార్చండి"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"ఎడమ మౌస్ బటన్‌ను, కుడి బటన్‌గా ఉపయోగించండి"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"కీబోర్డ్ షార్ట్‌కట్‌లు"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"షార్ట్‌కట్‌ల లిస్ట్‌ను చూడండి"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"కార్యాలయ ప్రొఫైల్ కీబోర్డ్‌లు &amp; సాధనాలు"</string>
@@ -2026,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> కొసం కొత్త కీని ఎంచుకోండి:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"ఫిజికల్ కీబోర్డ్ యాక్సెసిబిలిటీ"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"స్టిక్కీ కీలు, బౌన్స్ కీలు, మౌస్ కీలు"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> లేఅవుట్"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ఆటోమేటిక్"</string>
@@ -2434,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"ప్రివ్యూ"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"స్టాండర్డ్ ఆప్షన్‌లు"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"భాష"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"క్యాప్షన్ సైజ్"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"క్యాప్షన్ స్టయిల్"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"అనుకూల ఎంపికలు"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"నేపథ్య రంగు"</string>
@@ -2979,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"ఈ VPNను డిస్‌కనెక్ట్ చేయాలా?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"డిస్‌కనెక్ట్ చేయండి"</string>
     <string name="vpn_version" msgid="6344167191984400976">"వెర్షన్"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"VPNని విస్మరించు"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"ఇప్పటికే ఉన్న VPNని భర్తీ చేయాలా?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"ఎల్లప్పుడూ ఆన్‌లో ఉండే VPNని సెట్ చేయాలా?"</string>
@@ -5459,4 +5469,8 @@
     <string name="contacts_storage_selection_message" msgid="8082077300632059003">"కాంటాక్ట్‌లు మీ పరికరంలో సేవ్ అయ్యి, ఆటోమేటిక్‌గా మీ ఖాతాకు సింక్ అవుతాయి"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"ఆటోమేటిక్ సెట్టింగ్ సెట్ చేయబడలేదు"</string>
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"ప్రారంభించడానికి ఒక ఖాతాను జోడించండి"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
+    <skip />
 </resources>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index 3d5a22f..b517a84 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"กระเป๋าเอกสาร"</item>
-    <item msgid="184985872234062767">"อาคารคลาสสิก"</item>
-    <item msgid="9189550412466785530">"อาคารอพาร์ตเมนต์"</item>
-    <item msgid="2142527562511049422">"ลูกโป่งคำพูด"</item>
-    <item msgid="2548100558260478605">"กลุ่มคน"</item>
-    <item msgid="2270003903304578284">"หลอดไฟ"</item>
-    <item msgid="4793496619091161864">"ปฏิทิน"</item>
-    <item msgid="5673625795644364100">"ห้ามรบกวน"</item>
-    <item msgid="1423820834865831361">"คนกำลังวิ่ง"</item>
-    <item msgid="2037298830718732608">"กอล์ฟ"</item>
-    <item msgid="2197835014443491074">"ดัมเบลล์ในยิม"</item>
-    <item msgid="2730180105015616518">"ว่ายน้ำ"</item>
-    <item msgid="2666922823253345958">"คนกำลังปีนเขา"</item>
-    <item msgid="8234880356472211396">"คนขว้างบอล"</item>
-    <item msgid="4642980625253001443">"คนทำท่าเตะ"</item>
-    <item msgid="4324795269518833500">"เกมคอนโทรลเลอร์"</item>
-    <item msgid="7789966425125441125">"จานสีของศิลปิน"</item>
-    <item msgid="663512680597461570">"เกล็ดหิมะ"</item>
-    <item msgid="7952183800501346803">"ร่มชายหาด"</item>
-    <item msgid="799139025758265891">"เครื่องมือเวิร์กช็อป"</item>
-    <item msgid="1330084588359129896">"เต็นท์"</item>
-    <item msgid="3861584909935022342">"ม้วนฟิล์ม"</item>
-    <item msgid="5827426100157335512">"หนังสือ"</item>
-    <item msgid="8585828346253128384">"ดอกบัว"</item>
-    <item msgid="8788370542815300188">"คนกำลังครุ่นคิด"</item>
-    <item msgid="7287354964767553293">"หูฟัง"</item>
-    <item msgid="2530059623783800987">"ทีวี"</item>
-    <item msgid="5307182323469376758">"รถไฟ"</item>
-    <item msgid="4903790544026923026">"รถยนต์"</item>
-    <item msgid="5010405583912314582">"ส้อมและมีด"</item>
-    <item msgid="8939998598599064900">"รถเข็นสินค้า"</item>
-    <item msgid="3379605903308731893">"บุตร"</item>
-    <item msgid="7808668968550293112">"อุ้งเท้าสัตว์"</item>
-    <item msgid="1000692647524056504">"ป้ายดาว"</item>
-    <item msgid="8270261073421676502">"คน 2 คน"</item>
-    <item msgid="5767782819651505460">"ดาว"</item>
-    <item msgid="4368451291862729334">"หัวใจ"</item>
-    <item msgid="2613199102208419986">"บ้าน"</item>
-    <item msgid="3022279986430275040">"พระจันทร์ครึ่งดวง"</item>
-    <item msgid="5421089790869483206">"นาฬิกา"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index ec628f8..874825f 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"ตั้งค่าอัตโนมัติโดยใช้เครือข่ายและสัญญาณไร้สาย"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"เขตเวลาอัตโนมัติ"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"ตั้งค่าโดยอัตโนมัติตามเครือข่ายมือถือที่อยู่ใกล้คุณ"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"ตั้งค่าโดยอัตโนมัติโดยใช้ตำแหน่งของอุปกรณ์ หากมี และอาจต้องเชื่อมต่อ Wi-Fi อยู่"</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"ใช้รูปแบบเริ่มต้นในท้องถิ่น"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"ใช้รูปแบบ 24 ชั่วโมง"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"เวลา"</string>
@@ -1946,25 +1947,25 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"การช่วยเหลือพิเศษ"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"แป้นพิมพ์จริง"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"คีย์ตีกลับ"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"แป้นพิมพ์จะละเว้นการกดปุ่มเดียวกันซ้ำๆ อย่างรวดเร็ว"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"เกณฑ์คีย์ตีกลับ"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"เลือกระยะเวลาที่แป้นพิมพ์จะละเว้นการกดปุ่มซ้ำ"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0.2 วินาที"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0.4 วินาที"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0.6 วินาที"</string>
     <string name="slow_keys" msgid="2891452895499690837">"เพิ่มระยะเวลาในการกดปุ่ม"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"ปรับเวลาที่ใช้ในการกดปุ่มเพื่อเปิดใช้งาน"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"คีย์ติดหนึบ"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"กดทีละปุ่มเพื่อใช้แป้นพิมพ์ลัดแทนการกดปุ่มค้างไว้พร้อมกัน"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"แป้นเมาส์"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"ใช้แป้นพิมพ์เพื่อควบคุมตัวชี้"</string>
+    <!-- no translation found for mouse_reverse_vertical_scrolling (154907817154779952) -->
+    <skip />
+    <!-- no translation found for mouse_reverse_vertical_scrolling_summary (3386655598642587942) -->
+    <skip />
+    <!-- no translation found for mouse_swap_primary_button (3028204969091057207) -->
+    <skip />
+    <!-- no translation found for mouse_swap_primary_button_summary (3276638019321067902) -->
     <skip />
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"แป้นพิมพ์ลัด"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"แสดงรายการแป้นพิมพ์ลัด"</string>
@@ -2034,9 +2035,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"เลือกคีย์ใหม่สำหรับ <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"การช่วยเหลือพิเศษด้วยแป้นพิมพ์จริง"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"คีย์ติดหนึบ คีย์ตีกลับ แป้นเมาส์"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"เลย์เอาต์ <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ค่าเริ่มต้น"</string>
@@ -2987,6 +2992,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"ยกเลิกการเชื่อมต่อ VPN นี้ไหม"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"ยกเลิกการเชื่อมต่อ"</string>
     <string name="vpn_version" msgid="6344167191984400976">"รุ่น"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"ลืม VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"แทนที่ VPN ที่มีอยู่หรือไม่"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"ตั้งค่า VPN แบบเปิดตลอดเวลาหรือไม่"</string>
@@ -5462,13 +5469,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"ค้นหาในการตั้งค่า"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"รายชื่อติดต่อ พื้นที่เก็บข้อมูล บัญชี"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"พื้นที่เก็บข้อมูลรายชื่อติดต่อ"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"อุปกรณ์เท่านั้น"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"รายชื่อติดต่อใหม่จะไม่ซิงค์กับบัญชี"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"ระบบจะบันทึกรายชื่อติดต่อไว้ในอุปกรณ์และซิงค์กับบัญชีของคุณโดยค่าเริ่มต้น"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"ไม่ได้ตั้งค่าบัญชีเริ่มต้น"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"เพิ่มบัญชีเพื่อเริ่มต้นใช้งาน"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index 2a13662..5ab6f4d 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Briefcase"</item>
-    <item msgid="184985872234062767">"Classical na gusali"</item>
-    <item msgid="9189550412466785530">"Gusali ng apartment"</item>
-    <item msgid="2142527562511049422">"Speech bubble"</item>
-    <item msgid="2548100558260478605">"Grupo ng mga tao"</item>
-    <item msgid="2270003903304578284">"Bumbilya"</item>
-    <item msgid="4793496619091161864">"Kalendaryo"</item>
-    <item msgid="5673625795644364100">"Huwag Istorbohin"</item>
-    <item msgid="1423820834865831361">"Taong tumatakbo"</item>
-    <item msgid="2037298830718732608">"Golf"</item>
-    <item msgid="2197835014443491074">"Dumbbell ng gym"</item>
-    <item msgid="2730180105015616518">"Paglangoy"</item>
-    <item msgid="2666922823253345958">"Taong nagha-hike"</item>
-    <item msgid="8234880356472211396">"Taong naghahagis ng bola"</item>
-    <item msgid="4642980625253001443">"Taong sumisipa"</item>
-    <item msgid="4324795269518833500">"Game controller"</item>
-    <item msgid="7789966425125441125">"Palette ng kulay ng artist"</item>
-    <item msgid="663512680597461570">"Snowflake"</item>
-    <item msgid="7952183800501346803">"Beach umbrella"</item>
-    <item msgid="799139025758265891">"Mga tool sa workshop"</item>
-    <item msgid="1330084588359129896">"Tent"</item>
-    <item msgid="3861584909935022342">"Film reel"</item>
-    <item msgid="5827426100157335512">"Libro"</item>
-    <item msgid="8585828346253128384">"Bulaklak na lotus"</item>
-    <item msgid="8788370542815300188">"Isip ng tao"</item>
-    <item msgid="7287354964767553293">"Headphones"</item>
-    <item msgid="2530059623783800987">"TV"</item>
-    <item msgid="5307182323469376758">"Tren"</item>
-    <item msgid="4903790544026923026">"Kotse"</item>
-    <item msgid="5010405583912314582">"Tinidor at kutsilyo"</item>
-    <item msgid="8939998598599064900">"Shopping cart"</item>
-    <item msgid="3379605903308731893">"Bata"</item>
-    <item msgid="7808668968550293112">"Paa ng hayop"</item>
-    <item msgid="1000692647524056504">"Star badge"</item>
-    <item msgid="8270261073421676502">"Dalawang tao"</item>
-    <item msgid="5767782819651505460">"Bituin"</item>
-    <item msgid="4368451291862729334">"Puso"</item>
-    <item msgid="2613199102208419986">"Bahay"</item>
-    <item msgid="3022279986430275040">"Half-moon"</item>
-    <item msgid="5421089790869483206">"Orasan"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 0557ad3..7fbfb96 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Awtomatikong itakda gamit ang iyong network at mga wireless na signal"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Awtomatikong time zone"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Awtomatikong itakda batay sa mga mobile network na malapit sa iyo"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Awtomatikong itakda gamit ang lokasyon ng device kung available Baka kailangan ng koneksyon sa Wifi."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Gamitin ang lokal na default"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Gamitin ang format na 24-oras"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Oras"</string>
@@ -1958,6 +1959,10 @@
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Paisa-isang pumindot ng key para sa mga shortcut sa halip na sabay-sabay na pindutin ang mga key"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Mga mouse key"</string>
     <string name="mouse_keys_summary" msgid="7030731235143286467">"Gamitin ang iyong keyboard para kontrolin ang pointer"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Reverse na pag-scroll ng mouse"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Mag-scroll pataas para ibaba ang page"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Pagpalitin ang kaliwa at kanang button"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Gamitin ang kaliwang button ng mouse bilang iyong kanan"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Mga keyboard shortcut"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Ipakita ang listahan ng mga shortcut"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Mga keyboard at tool ng profile sa trabaho"</string>
@@ -2026,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Pumili ng bagong key para sa <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Accessibility ng pisikal na keyboard"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Mga sticky key, Mga bounce key, Mga mouse key"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Layout na <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Default"</string>
@@ -2434,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"I-preview"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Mga karaniwang pagpipilian"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Wika"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Laki ng caption"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Istilo ng caption"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Mga custom na pagpipilian"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Kulay ng background"</string>
@@ -2979,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Putulin ang koneksyon ng VPN na ito?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Putulin ang koneksyon"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Bersyon"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Kalimutan ang VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Gusto mo bang palitan ang dati nang VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Gusto mo bang itakda ang VPN na palaging naka-on?"</string>
@@ -5459,4 +5469,8 @@
     <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Ise-save sa iyong device at isi-sync sa iyong account bilang default ang mga contact"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Walang itinakdang default"</string>
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Magdagdag ng account para magsimula"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
+    <skip />
 </resources>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index b7e2f64..6b2bea4 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Evrak çantası"</item>
-    <item msgid="184985872234062767">"Klasik bina"</item>
-    <item msgid="9189550412466785530">"Apartman binası"</item>
-    <item msgid="2142527562511049422">"Konuşma balonu"</item>
-    <item msgid="2548100558260478605">"Bir grup insan"</item>
-    <item msgid="2270003903304578284">"Ampul"</item>
-    <item msgid="4793496619091161864">"Takvim"</item>
-    <item msgid="5673625795644364100">"Rahatsız Etmeyin"</item>
-    <item msgid="1423820834865831361">"Koşan bir kişi"</item>
-    <item msgid="2037298830718732608">"Golf"</item>
-    <item msgid="2197835014443491074">"Spor salonu dambılı"</item>
-    <item msgid="2730180105015616518">"Yüzme"</item>
-    <item msgid="2666922823253345958">"Doğa yürüyüşü yapan bir kişi"</item>
-    <item msgid="8234880356472211396">"Top atan bir kişi"</item>
-    <item msgid="4642980625253001443">"Tekme atan bir kişi"</item>
-    <item msgid="4324795269518833500">"Oyun kumandası"</item>
-    <item msgid="7789966425125441125">"Sanatçı renk paleti"</item>
-    <item msgid="663512680597461570">"Kar tanesi"</item>
-    <item msgid="7952183800501346803">"Plaj şemsiyesi"</item>
-    <item msgid="799139025758265891">"Atölye araçları"</item>
-    <item msgid="1330084588359129896">"Çadır"</item>
-    <item msgid="3861584909935022342">"Film rulosu"</item>
-    <item msgid="5827426100157335512">"Kitap"</item>
-    <item msgid="8585828346253128384">"Nilüfer çiçeği"</item>
-    <item msgid="8788370542815300188">"İnsan aklı"</item>
-    <item msgid="7287354964767553293">"Kulaklık"</item>
-    <item msgid="2530059623783800987">"TV"</item>
-    <item msgid="5307182323469376758">"Tren"</item>
-    <item msgid="4903790544026923026">"Araba"</item>
-    <item msgid="5010405583912314582">"Çatal ve bıçak"</item>
-    <item msgid="8939998598599064900">"Alışveriş sepeti"</item>
-    <item msgid="3379605903308731893">"Çocuk"</item>
-    <item msgid="7808668968550293112">"Hayvan pençesi"</item>
-    <item msgid="1000692647524056504">"Yıldız rozeti"</item>
-    <item msgid="8270261073421676502">"İki kişi"</item>
-    <item msgid="5767782819651505460">"Yıldız"</item>
-    <item msgid="4368451291862729334">"Kalp"</item>
-    <item msgid="2613199102208419986">"Ev"</item>
-    <item msgid="3022279986430275040">"Yarım ay"</item>
-    <item msgid="5421089790869483206">"Saat"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 7cfc243..624ef1c 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Ağınızı ve kablosuz sinyallerinizi kullanarak otomatik olarak ayarlayın"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Otomatik saat dilimi"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Yakınınızdaki mobil ağlara göre otomatik olarak ayarlayın"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Varsa cihazınızın konumu ile otomatik olarak ayarlanır. Etkin bir kablosuz bağlantı da gerekebilir."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Yerel ayar varsayılan değerini kullan"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24 saat biçimini kullan"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Saat"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Erişilebilirlik"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Fiziksel klavye"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Geri sekme tuşları"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Klavye, aynı tuşa hızlı bir şekilde tekrarlanan basma işlemlerini yoksayar"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Tekrarlı basmayı yoksayma tuş eşiği"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Klavyenizin, tuşlara ne kadar süre içinde tekrarlanan basma işlemlerini yoksayacağını seçin"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2 saniye"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4 saniye"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0,6 saniye"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Yavaş tuşlar"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Bir tuşa basma işleminin etkinleştirileceği süreyi ayarlar"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Yapışkan tuşlar"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Tuşları aynı anda basılı tutmak yerine kısayollar için tek seferde bir tuşa basın"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Fare tuşları"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"İşaretçiyi kontrol etmek için klavyenizi kullanın"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Fare ters kaydırma"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Sayfayı aşağı taşımak için yukarı kaydırın"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Sol ve sağ düğmeleri değiştir"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Sol fare düğmesini sağ fare düğmesi olarak kullanın"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Klavye kısayolları"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Kısayol listesini göster"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"İş profili klavyeleri ve araçları"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> için yeni bir tuş seçin:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Fiziksel klavye erişilebilirliği"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Yapışkan tuşlar, geri sekme tuşları, fare tuşları"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> düzeni"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Varsayılan"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Önizle"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standart seçenekler"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Dil"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Altyazı boyutu"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Altyazı stili"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Özel seçenekler"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Arka plan rengi"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Bu VPN\'nin bağlantısı kesilsin mi?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Bağlantıyı kes"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Sürüm"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"VPN\'yi unut"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Mevcut VPN değiştirilsin mi?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Her zaman açık VPN ayarlansın mı?"</string>
@@ -3837,7 +3839,7 @@
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"mesajlar"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Mesajlar"</string>
     <string name="zen_mode_messages_header" msgid="253721635061451577">"Kesintiye neden olabilecek mesajlar"</string>
-    <string name="zen_mode_messages_footer" msgid="6002468050854126331">"İzin verilen mesajların ses çıkardığından emin olmak için cihazınızın çalmaya ayarlı olduğundan emin olun"</string>
+    <string name="zen_mode_messages_footer" msgid="6002468050854126331">"İzin verilen mesajlardan sesli uyarı alabilmek için için cihazınızın zil sesi çıkaracak şekilde ayarlı olduğundan emin olun"</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"\"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" için gelen mesajlar engelleniyor. Arkadaşlarınız, aileniz veya diğer kişilerin size ulaşmasına izin vermek için ayarları düzenleyebilirsiniz."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Tüm mesajlar size ulaşabilir"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Tüm aramalar size ulaşabilir"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Ayarlar\'da ara"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"kişiler, depolama alanı, hesap"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Kişi deposu"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Yalnızca cihaz"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Yeni kişiler bir hesapla senkronize edilmez"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Kişiler varsayılan olarak cihazınıza kaydedilir ve hesabınızla senkronize edilir"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Varsayılan ayar yok"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Başlamak için hesap ekleyin"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 45639e5..210463e 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Портфель"</item>
-    <item msgid="184985872234062767">"Будівля в класичному стилі"</item>
-    <item msgid="9189550412466785530">"Багатоквартирний будинок"</item>
-    <item msgid="2142527562511049422">"Виноска з текстом"</item>
-    <item msgid="2548100558260478605">"Група людей"</item>
-    <item msgid="2270003903304578284">"Лампочка"</item>
-    <item msgid="4793496619091161864">"Календар"</item>
-    <item msgid="5673625795644364100">"Не турбувати"</item>
-    <item msgid="1423820834865831361">"Людина біжить"</item>
-    <item msgid="2037298830718732608">"Гольф"</item>
-    <item msgid="2197835014443491074">"Спортивна гантель"</item>
-    <item msgid="2730180105015616518">"Плавання"</item>
-    <item msgid="2666922823253345958">"Людина в поході"</item>
-    <item msgid="8234880356472211396">"Людина кидає м’яч"</item>
-    <item msgid="4642980625253001443">"Людина б’є ногою"</item>
-    <item msgid="4324795269518833500">"Ігровий контролер"</item>
-    <item msgid="7789966425125441125">"Палітра художника"</item>
-    <item msgid="663512680597461570">"Сніжинка"</item>
-    <item msgid="7952183800501346803">"Пляжна парасоля"</item>
-    <item msgid="799139025758265891">"Інструменти для майстерні"</item>
-    <item msgid="1330084588359129896">"Намет"</item>
-    <item msgid="3861584909935022342">"Кіноплівка"</item>
-    <item msgid="5827426100157335512">"Книга"</item>
-    <item msgid="8585828346253128384">"Квітка лотоса"</item>
-    <item msgid="8788370542815300188">"Людський розум"</item>
-    <item msgid="7287354964767553293">"Навушники"</item>
-    <item msgid="2530059623783800987">"Телевізор"</item>
-    <item msgid="5307182323469376758">"Поїзд"</item>
-    <item msgid="4903790544026923026">"Автомобіль"</item>
-    <item msgid="5010405583912314582">"Виделка й ніж"</item>
-    <item msgid="8939998598599064900">"Кошик для покупок"</item>
-    <item msgid="3379605903308731893">"Дитина"</item>
-    <item msgid="7808668968550293112">"Лапа тварини"</item>
-    <item msgid="1000692647524056504">"Значок зірочки"</item>
-    <item msgid="8270261073421676502">"Двоє людей"</item>
-    <item msgid="5767782819651505460">"Зірка"</item>
-    <item msgid="4368451291862729334">"Серце"</item>
-    <item msgid="2613199102208419986">"Будинок"</item>
-    <item msgid="3022279986430275040">"Півмісяць"</item>
-    <item msgid="5421089790869483206">"Годинник"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index ad50504..7d107b5 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Визначати автоматично за допомогою мережі й бездротових сигналів"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Автоматичний часовий пояс"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Визначати автоматично на основі мобільних мереж поблизу"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Визначати автоматично на основі геоданих пристрою (якщо доступно). Також може знадобитися активне з’єднання Wi-Fi."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Використовувати місцеві налаштування за умовчанням"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-годинний формат"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Час"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Доступність"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Фізична клавіатура"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Ігнорувати повторне натискання"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Клавіатура ігнорує кілька натискань однієї клавіші поспіль"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Поріг ігнорування повт. натискання"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Виберіть, протягом якого часу клавіатура ігноруватиме кілька натискань однієї клавіші"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2 с"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4 с"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0,6 с"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Повільні клавіші"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Установлює проміжок часу, через який клавіша реагує на натискання"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Залипання клавіш"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Натискайте клавіші по одній, замість того щоб утримувати їх одночасно"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Клавіші для керування мишею"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Щоб керувати курсором, використовуйте клавіатуру"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Зворотне прокручування мишею"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Прокручувати вгору, щоб переміщатися сторінкою вниз"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Поміняти місцями ліву й праву кнопки"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Використовувати ліву кнопку миші як праву"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Комбінації клавіш"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Показати список комбінацій клавіш"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Клавіатури та інструменти робочого профілю"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Виберіть нову клавішу для <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Функції доступності фізичної клавіатури"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Залипання клавіш, ігнорування повторного натискання клавіш, клавіші для керування мишею"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Розкладка <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"За умовчанням"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Переглянути"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Стандартні параметри"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Мова"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Розмір субтитрів"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Стиль субтитрів"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Спеціальні параметри"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Колір фону"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Відключити цю мережу VPN?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Відключити"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Версія"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Забути мережу VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Замінити наявну мережу VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Увімкнути постійну мережу VPN?"</string>
@@ -5464,13 +5466,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Шукати в налаштуваннях"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"контакти, пам’ять, обліковий запис"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Пам’ять контактів"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Лише на пристрої"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Нові контакти не синхронізуватимуться з обліковим записом"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Контакти будуть зберігатися на пристрої і за умовчанням синхронізуватися з обліковим записом"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Немає параметра за умовчанням"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Щоб почати, додайте обліковий запис"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-ur/arrays.xml b/res/values-ur/arrays.xml
index 4563275..6acd7c7 100644
--- a/res/values-ur/arrays.xml
+++ b/res/values-ur/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"بریف کیس"</item>
-    <item msgid="184985872234062767">"کلاسیکل عمارت"</item>
-    <item msgid="9189550412466785530">"اپارٹمنٹ والی عمارت"</item>
-    <item msgid="2142527562511049422">"اسپیچ ببل"</item>
-    <item msgid="2548100558260478605">"لوگوں کا گروپ"</item>
-    <item msgid="2270003903304578284">"لائٹ بلب"</item>
-    <item msgid="4793496619091161864">"کیلنڈر"</item>
-    <item msgid="5673625795644364100">"ڈسٹرب نہ کریں"</item>
-    <item msgid="1423820834865831361">"دوڑتا ہوا شخص"</item>
-    <item msgid="2037298830718732608">"گولف"</item>
-    <item msgid="2197835014443491074">"جم ڈم بیل"</item>
-    <item msgid="2730180105015616518">"تیراکی"</item>
-    <item msgid="2666922823253345958">"ہائک کرتا ہوا شخص"</item>
-    <item msgid="8234880356472211396">"گیند پھینکتا ہوا شخص"</item>
-    <item msgid="4642980625253001443">"کک مارتا ہوا شخص"</item>
-    <item msgid="4324795269518833500">"گیم کنٹرولر"</item>
-    <item msgid="7789966425125441125">"آرٹسٹ رنگ کا پیلیٹ"</item>
-    <item msgid="663512680597461570">"برف کا گولا"</item>
-    <item msgid="7952183800501346803">"ساحل کی چھتری"</item>
-    <item msgid="799139025758265891">"ورکشاپ ٹولز"</item>
-    <item msgid="1330084588359129896">"خیمہ"</item>
-    <item msgid="3861584909935022342">"فلم ریل"</item>
-    <item msgid="5827426100157335512">"کتاب"</item>
-    <item msgid="8585828346253128384">"کنول کا پھول"</item>
-    <item msgid="8788370542815300188">"شخص کا ذہن"</item>
-    <item msgid="7287354964767553293">"ہیڈ فونز"</item>
-    <item msgid="2530059623783800987">"TV"</item>
-    <item msgid="5307182323469376758">"ٹرین"</item>
-    <item msgid="4903790544026923026">"کار"</item>
-    <item msgid="5010405583912314582">"کانٹا اور چھری"</item>
-    <item msgid="8939998598599064900">"شاپنگ کارٹ"</item>
-    <item msgid="3379605903308731893">"بچہ"</item>
-    <item msgid="7808668968550293112">"جانور کا پنجا"</item>
-    <item msgid="1000692647524056504">"اسٹار بیج"</item>
-    <item msgid="8270261073421676502">"دو لوگ"</item>
-    <item msgid="5767782819651505460">"ستارہ"</item>
-    <item msgid="4368451291862729334">"دل"</item>
-    <item msgid="2613199102208419986">"گھر"</item>
-    <item msgid="3022279986430275040">"آدھا چاند"</item>
-    <item msgid="5421089790869483206">"گھڑی"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 504284e..806aea5 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"اپنے نیٹ ورک اور وائرلیس سگنلز کا استعمال کرتے ہوئے خود بخود سیٹ کریں"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"خودکار ٹائم زون"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"اپنے قریب کے موبائل نیٹ ورکس کی بنیاد پر خود بخود سیٹ کریں"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"‏دستیاب ہونے پر اپنے آلہ کا مقام استعمال کرتے ہوئے خود بخود سیٹ کریں۔ ایک فعال WiFi کنکشن بھی درکار ہو سکتا ہے۔"</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"مقامی ڈیفالٹ کا استعمال کریں"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24 گھنٹے کا فارمیٹ استعمال کریں"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"وقت"</string>
@@ -1958,6 +1959,10 @@
     <string name="sticky_keys_summary" msgid="1844953803625480623">"کلیدوں کو ایک ساتھ نیچے کی طرف پکڑے رکھنے کے بجائے، شارٹ کٹس کیلئے ایک وقت میں ایک کلید دبائیں"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"ماؤس کیز"</string>
     <string name="mouse_keys_summary" msgid="7030731235143286467">"پوائنٹر کو کنٹرول کرنے کے لیے اپنا کی بورڈ استعمال کریں"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"ماؤس کی معکوس اسکرولنگ"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"صفحہ کو نیچے منتقل کرنے کے لیے اوپر اسکرول کریں"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"بائیں اور دائیں بٹنز کو سویپ کریں"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"بائیں ماؤس کے بٹن کو اپنے دائیں کے طور پر استعمال کریں"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"کی بورڈ شارٹ کٹس"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"شارٹ کٹس کی فہرست دکھائیں"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"دفتری پروفائل کے کی بورڈز اور ٹولز"</string>
@@ -2026,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"‫<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> کے لیے نئی کلید منتخب کریں:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"فزیکل کی بورڈ ایکسیسبیلٹی"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"دبی رہنے والی کلیدیں، باؤنس کلیدیں، ماؤس کلیدیں"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> لے آؤٹ"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ڈیفالٹ"</string>
@@ -2434,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"پیش منظر دیکھیں"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"معیاری اختیارات"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"زبان"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"کیپشن کا سائز"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"کیپشن کا طرز"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"حسب ضرورت اختیارات"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"پس منظر کا رنگ"</string>
@@ -2979,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"‏اس VPN سے غیر منسلک کریں؟"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"غیر منسلک کریں"</string>
     <string name="vpn_version" msgid="6344167191984400976">"ورژن"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"‏VPN بھول جائیں"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"‏موجودہ VPN بدلیں؟"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"‏ہمیشہ آن VPN سیٹ کریں؟"</string>
@@ -5459,4 +5469,8 @@
     <string name="contacts_storage_selection_message" msgid="8082077300632059003">"رابطے آپ کے آلے میں محفوظ کیے جائیں گے اور آپ کے اکاؤنٹ میں بطور ڈیفالٹ مطابقت پذیر ہوں گے"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"کوئی ڈیفالٹ سیٹ نہیں ہے"</string>
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"شروع کرنے کیلئے ایک اکاؤنٹ شامل کریں"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
+    <skip />
 </resources>
diff --git a/res/values-uz/arrays.xml b/res/values-uz/arrays.xml
index 8764027..44a943c 100644
--- a/res/values-uz/arrays.xml
+++ b/res/values-uz/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Portfel"</item>
-    <item msgid="184985872234062767">"Klassik bino"</item>
-    <item msgid="9189550412466785530">"Uy-joy maskani"</item>
-    <item msgid="2142527562511049422">"Izohli havola"</item>
-    <item msgid="2548100558260478605">"Odamlar guruhi"</item>
-    <item msgid="2270003903304578284">"Elektr lampa"</item>
-    <item msgid="4793496619091161864">"Taqvim"</item>
-    <item msgid="5673625795644364100">"Bezovta qilinmasin"</item>
-    <item msgid="1423820834865831361">"Yugurayotgan odam"</item>
-    <item msgid="2037298830718732608">"Golf"</item>
-    <item msgid="2197835014443491074">"Sport zalidagi gantel"</item>
-    <item msgid="2730180105015616518">"Suzish"</item>
-    <item msgid="2666922823253345958">"Piyoda sayrdagi odam"</item>
-    <item msgid="8234880356472211396">"Koptok otayotgan odam"</item>
-    <item msgid="4642980625253001443">"Tepayotgan odam"</item>
-    <item msgid="4324795269518833500">"Oʻyin kontrolleri"</item>
-    <item msgid="7789966425125441125">"Rassom rang palitrasi"</item>
-    <item msgid="663512680597461570">"Qor parchasi"</item>
-    <item msgid="7952183800501346803">"Sohil soyaboni"</item>
-    <item msgid="799139025758265891">"Asbob-uskunalar"</item>
-    <item msgid="1330084588359129896">"Chodir"</item>
-    <item msgid="3861584909935022342">"Plyonka ruloni"</item>
-    <item msgid="5827426100157335512">"Kitob"</item>
-    <item msgid="8585828346253128384">"Lotus guli"</item>
-    <item msgid="8788370542815300188">"Odam aqli"</item>
-    <item msgid="7287354964767553293">"Quloqliklar"</item>
-    <item msgid="2530059623783800987">"TV"</item>
-    <item msgid="5307182323469376758">"Poyezd"</item>
-    <item msgid="4903790544026923026">"Avtomobil"</item>
-    <item msgid="5010405583912314582">"Sanchqi va pichoq"</item>
-    <item msgid="8939998598599064900">"Xarid savati"</item>
-    <item msgid="3379605903308731893">"Bola"</item>
-    <item msgid="7808668968550293112">"Jonivor panjasi"</item>
-    <item msgid="1000692647524056504">"Yulduzcha nishoni"</item>
-    <item msgid="8270261073421676502">"Ikki kishi"</item>
-    <item msgid="5767782819651505460">"Yulduz"</item>
-    <item msgid="4368451291862729334">"Yurak"</item>
-    <item msgid="2613199102208419986">"Uy"</item>
-    <item msgid="3022279986430275040">"Yarim oy"</item>
-    <item msgid="5421089790869483206">"Soat"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 79e0452..c32c824 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Qurilmadagi tarmoq va simsiz signallar orqali avtomatik sozlash"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Avtomatik vaqt mintaqasi"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Atrofdagi mobil tarmoq asosida avtomatik sozlash"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Geo-joylashuv asosida avtomatik sozlash. Wi-Fi aloqasi talab etilishi mumkin."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Birlamchi hududiy sozlamalar"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24 soatlik format"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Vaqt"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Qulayliklar"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Tashqi klaviatura"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Qayta bosishni nazorat qilish"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Klaviaturada bir tugmaning tez takroriy bosilishi inkor etiladi"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Takroriy bosishlar intervali"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Klaviaturada tugmaning takroriy bosilishi qancha vaqt inkor etilishini tanlang"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0.2s"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0.4s"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0.6s"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Sekin tugmalar"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Tugmani bosish intervali hamda uning amalini sozlash"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Yopishqoq tugmalar"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Barcha tugmalar kombinatsiyasini bosib turish oʻrniga ularni birma-bir bosing"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Sinchqoncha tugmalari"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Kursorni klaviatura orqali boshqarish"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Sichqonchada teskari varaqlash"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Sahifani pastga varaqlash uchun tepaga suring"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Chap va oʻng tugmalarni almashtirish"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Sichqonchada chap tugmani oʻng tugma sifatida ishlatish"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Tezkor tugmalar"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Tezkor tugmalar roʻyxatini ochish"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Ish profili klaviaturalari va vositalari"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> uchun yangi tugma tanlang:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Jismoniy klaviatura uchun qulayliklar"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Yopishqoq tugmalar, qayta bosish boshqaruvi, sichqonchani boshqarish tugmalari"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> sxemasi"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Standart"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Dastlabki ko‘rib chiqish"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Standart sozlamalar"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Til"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Tagyozuv hajmi"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Taglavhalar uslubi"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Buyurtmali tanlamalar"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Fon rangi"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Bu VPN bilan aloqa uzilsinmi?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Aloqani uzish"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Versiya"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"VPNni o‘chirish"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Mavjud VPN tarmog‘i almashtirilsinmi?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Doimiy VPN o‘rnatilsinmi?"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Qidiruv sozlamalari"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"kontaktlar, xotira, hisob"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Kontaktlar ombori"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Faqat qurilmada"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Yangi kontaktlar hisobga sinxronlanmaydi"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Birlamchi holatda kontaktlar qurilmada saqlanadi va hisobga sinxronlanadi"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Asosiy hisob tayinlanmagan"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Avval hisob qoʻshing"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 7763c19..978d4a7 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Cặp tài liệu"</item>
-    <item msgid="184985872234062767">"Toà nhà cổ điển"</item>
-    <item msgid="9189550412466785530">"Chung cư"</item>
-    <item msgid="2142527562511049422">"Ô lời thoại"</item>
-    <item msgid="2548100558260478605">"Nhóm người"</item>
-    <item msgid="2270003903304578284">"Bóng đèn"</item>
-    <item msgid="4793496619091161864">"Lịch"</item>
-    <item msgid="5673625795644364100">"Không làm phiền"</item>
-    <item msgid="1423820834865831361">"Người đang chạy"</item>
-    <item msgid="2037298830718732608">"Gôn"</item>
-    <item msgid="2197835014443491074">"Tạ tập thể dục"</item>
-    <item msgid="2730180105015616518">"Bơi"</item>
-    <item msgid="2666922823253345958">"Người đang đi bộ đường dài"</item>
-    <item msgid="8234880356472211396">"Người đang ném bóng"</item>
-    <item msgid="4642980625253001443">"Người đang đá"</item>
-    <item msgid="4324795269518833500">"Tay điều khiển trò chơi"</item>
-    <item msgid="7789966425125441125">"Bảng màu của nghệ sĩ"</item>
-    <item msgid="663512680597461570">"Bông tuyết"</item>
-    <item msgid="7952183800501346803">"Dù che trên bãi biển"</item>
-    <item msgid="799139025758265891">"Công cụ trong xưởng"</item>
-    <item msgid="1330084588359129896">"Lều"</item>
-    <item msgid="3861584909935022342">"Cuộn phim"</item>
-    <item msgid="5827426100157335512">"Sách"</item>
-    <item msgid="8585828346253128384">"Hoa sen"</item>
-    <item msgid="8788370542815300188">"Suy nghĩ của một người"</item>
-    <item msgid="7287354964767553293">"Tai nghe"</item>
-    <item msgid="2530059623783800987">"TV"</item>
-    <item msgid="5307182323469376758">"Xe lửa"</item>
-    <item msgid="4903790544026923026">"Ô tô"</item>
-    <item msgid="5010405583912314582">"Dao và nĩa"</item>
-    <item msgid="8939998598599064900">"Giỏ hàng"</item>
-    <item msgid="3379605903308731893">"Trẻ em"</item>
-    <item msgid="7808668968550293112">"Dấu chân động vật"</item>
-    <item msgid="1000692647524056504">"Huy hiệu ngôi sao"</item>
-    <item msgid="8270261073421676502">"2 người"</item>
-    <item msgid="5767782819651505460">"Ngôi sao"</item>
-    <item msgid="4368451291862729334">"Trái tim"</item>
-    <item msgid="2613199102208419986">"Nhà"</item>
-    <item msgid="3022279986430275040">"Nửa vầng trăng"</item>
-    <item msgid="5421089790869483206">"Đồng hồ"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index c0cd408..377d428 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Tự động đặt dựa trên tín hiệu không dây và mạng của bạn"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Múi giờ tự động"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Tự động đặt dựa trên các mạng di động gần bạn"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Tự động đặt dựa trên vị trí thiết bị của bạn, nếu có. Có thể cần kết nối Wi-Fi đang hoạt động."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Sử dụng định dạng của địa phương"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Sử dụng định dạng 24 giờ"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Giờ"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Hỗ trợ tiếp cận"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Bàn phím vật lý"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Phím nảy"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Bàn phím sẽ bỏ qua các lần nhấn nhanh liên tục cùng một phím"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Ngưỡng phím nảy"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Chọn khoảng thời gian bàn phím bỏ qua các lần nhấn phím liên tục"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0,2 giây"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0,4 giây"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0,6 giây"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Phím chậm"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Điều chỉnh thời gian cần để kích hoạt một lượt nhấn phím"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Phím cố định"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Nhấn từng phím một để dùng phím tắt thay vì giữ các phím cùng lúc"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Các phím điều khiển chuột"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Sử dụng bàn phím để điều khiển con trỏ"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Đảo ngược hướng cuộn chuột"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Cuộn lên để di chuyển xuống phía dưới của trang"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Hoán đổi nút chuột trái và phải"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Sử dụng nút chuột trái như nút chuột phải"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Phím tắt"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Hiện danh sách phím tắt"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Công cụ và bàn phím hồ sơ công việc"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Chọn một phím mới cho <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Hỗ trợ tiếp cận cho bàn phím vật lý"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Phím cố định, Phím nảy, Phím chuột"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Bố cục <xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Mặc định"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Xem trước"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Tùy chọn chuẩn"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Ngôn ngữ"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Kích thước phụ đề"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Kiểu phụ đề"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Tùy chọn tùy chỉnh"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Màu nền"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Ngắt kết nối VPN này?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Ngắt kết nối"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Phiên bản"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Xóa VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Thay thế VPN hiện có?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Đặt VPN luôn bật?"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Tìm kiếm trong phần Cài đặt"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"danh bạ, bộ nhớ, tài khoản"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Bộ nhớ danh bạ"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Chỉ thiết bị"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Những người liên hệ mới sẽ không được đồng bộ hoá với một tài khoản"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Những người liên hệ sẽ được lưu vào thiết bị và đồng bộ hoá với tài khoản của bạn theo mặc định"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Chưa đặt tài khoản mặc định nào"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Thêm một tài khoản để bắt đầu"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 43b3ced..765f4d0 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"公文包"</item>
-    <item msgid="184985872234062767">"古典建筑"</item>
-    <item msgid="9189550412466785530">"公寓建筑"</item>
-    <item msgid="2142527562511049422">"对话气泡"</item>
-    <item msgid="2548100558260478605">"一群人"</item>
-    <item msgid="2270003903304578284">"灯泡"</item>
-    <item msgid="4793496619091161864">"日历"</item>
-    <item msgid="5673625795644364100">"勿扰"</item>
-    <item msgid="1423820834865831361">"跑步的人"</item>
-    <item msgid="2037298830718732608">"高尔夫"</item>
-    <item msgid="2197835014443491074">"健身房哑铃"</item>
-    <item msgid="2730180105015616518">"游泳"</item>
-    <item msgid="2666922823253345958">"远足的人"</item>
-    <item msgid="8234880356472211396">"投球的人"</item>
-    <item msgid="4642980625253001443">"用脚踢的人"</item>
-    <item msgid="4324795269518833500">"游戏控制器"</item>
-    <item msgid="7789966425125441125">"艺术家调色板"</item>
-    <item msgid="663512680597461570">"雪花"</item>
-    <item msgid="7952183800501346803">"沙滩伞"</item>
-    <item msgid="799139025758265891">"工作坊工具"</item>
-    <item msgid="1330084588359129896">"帐篷"</item>
-    <item msgid="3861584909935022342">"电影胶片"</item>
-    <item msgid="5827426100157335512">"图书"</item>
-    <item msgid="8585828346253128384">"莲花"</item>
-    <item msgid="8788370542815300188">"人的思想"</item>
-    <item msgid="7287354964767553293">"头戴式耳机"</item>
-    <item msgid="2530059623783800987">"电视"</item>
-    <item msgid="5307182323469376758">"火车"</item>
-    <item msgid="4903790544026923026">"汽车"</item>
-    <item msgid="5010405583912314582">"刀叉"</item>
-    <item msgid="8939998598599064900">"购物车"</item>
-    <item msgid="3379605903308731893">"儿童"</item>
-    <item msgid="7808668968550293112">"动物爪子"</item>
-    <item msgid="1000692647524056504">"星形徽章"</item>
-    <item msgid="8270261073421676502">"两个人"</item>
-    <item msgid="5767782819651505460">"星星"</item>
-    <item msgid="4368451291862729334">"心形"</item>
-    <item msgid="2613199102208419986">"房屋"</item>
-    <item msgid="3022279986430275040">"半月"</item>
-    <item msgid="5421089790869483206">"时钟"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 1273f07..eba689b 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"使用您的网络和无线信号自动设定"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"自动确定时区"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"根据您附近的移动网络自动设定"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"使用您的设备位置信息(如果可用)自动设定。可能还需要有效的 WLAN 连接。"</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"使用默认语言区域"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"使用 24 小时制"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"时间"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"无障碍功能"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"实体键盘"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"防抖键"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"键盘会忽略快速重复按下同一按键的操作"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"防抖键阈值"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"选择键盘忽略重复按键操作的时长"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0.2 秒"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0.4 秒"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0.6 秒"</string>
     <string name="slow_keys" msgid="2891452895499690837">"慢速键"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"调整启用按键操作所需的时长"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"粘滞键"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"只需一次按下一个键即可执行快捷操作,而不用同时按住多个键"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"鼠标键"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"使用键盘来控制指针"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"鼠标反向滚动"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"向上滚动可使页面内容向下移动"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"切换左键和右键"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"将鼠标左键用作右键"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"键盘快捷键"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"显示快捷键列表"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"工作资料键盘和工具"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"为<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>选择新的辅助键:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"实体键盘无障碍功能"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"粘滞键、防抖键、鼠标键"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"“<xliff:g id="IME_LABEL">%s</xliff:g>”布局"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"默认"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"预览"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"标准选项"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"语言"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"字幕大小"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"字幕样式"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"自定义选项"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"背景颜色"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"要断开与此 VPN 的连接吗?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"断开连接"</string>
     <string name="vpn_version" msgid="6344167191984400976">"版本"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"取消保存 VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"要替换现有 VPN 吗?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"要设置始终开启的 VPN 吗?"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"在设置中搜索"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"联系人, 存储, 账号, contacts, storage, account"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"联系人存储"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"仅限设备"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"新联系人不会与账号同步"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"默认情况下,系统会将联系人保存到您的设备并同步到您的账号"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"未设置默认账号"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"添加账号即可开始"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml
index fa3cd29..8d38182 100644
--- a/res/values-zh-rHK/arrays.xml
+++ b/res/values-zh-rHK/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"公事包"</item>
-    <item msgid="184985872234062767">"古典建築"</item>
-    <item msgid="9189550412466785530">"住宅建築"</item>
-    <item msgid="2142527562511049422">"對話氣泡"</item>
-    <item msgid="2548100558260478605">"一群人"</item>
-    <item msgid="2270003903304578284">"燈膽"</item>
-    <item msgid="4793496619091161864">"日曆"</item>
-    <item msgid="5673625795644364100">"請勿騷擾"</item>
-    <item msgid="1423820834865831361">"跑步的人"</item>
-    <item msgid="2037298830718732608">"高爾夫球"</item>
-    <item msgid="2197835014443491074">"健身啞鈴"</item>
-    <item msgid="2730180105015616518">"游泳"</item>
-    <item msgid="2666922823253345958">"遠足的人"</item>
-    <item msgid="8234880356472211396">"擲球的人"</item>
-    <item msgid="4642980625253001443">"踢腿的人"</item>
-    <item msgid="4324795269518833500">"遊戲控制器"</item>
-    <item msgid="7789966425125441125">"畫家的調色碟"</item>
-    <item msgid="663512680597461570">"雪花"</item>
-    <item msgid="7952183800501346803">"沙灘傘"</item>
-    <item msgid="799139025758265891">"工作坊工具"</item>
-    <item msgid="1330084588359129896">"帳篷"</item>
-    <item msgid="3861584909935022342">"菲林卷軸"</item>
-    <item msgid="5827426100157335512">"書籍"</item>
-    <item msgid="8585828346253128384">"蓮花"</item>
-    <item msgid="8788370542815300188">"人的頭腦"</item>
-    <item msgid="7287354964767553293">"耳機"</item>
-    <item msgid="2530059623783800987">"電視"</item>
-    <item msgid="5307182323469376758">"火車"</item>
-    <item msgid="4903790544026923026">"汽車"</item>
-    <item msgid="5010405583912314582">"刀叉"</item>
-    <item msgid="8939998598599064900">"購物車"</item>
-    <item msgid="3379605903308731893">"小孩子"</item>
-    <item msgid="7808668968550293112">"動物爪子"</item>
-    <item msgid="1000692647524056504">"星號徽章"</item>
-    <item msgid="8270261073421676502">"兩個人"</item>
-    <item msgid="5767782819651505460">"星形"</item>
-    <item msgid="4368451291862729334">"心"</item>
-    <item msgid="2613199102208419986">"屋"</item>
-    <item msgid="3022279986430275040">"半月"</item>
-    <item msgid="5421089790869483206">"時鐘"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 8478b1c..bd046f3 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"使用網絡和無線訊號自動設定"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"自動設定時區"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"根據你附近的流動網絡自動設定"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"使用裝置位置 (如已開啟) 自動設定。你亦可能需要啟用 Wi-Fi 連線。"</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"使用地區設定預設值"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"使用 24 小時格式"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"時間"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"無障礙功能"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"實體鍵盤"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"篩選鍵"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"鍵盤會忽略快速重覆按下同一按鍵的動作"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"彈跳鍵門檻"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"選擇鍵盤忽略重覆按鍵的時間長度"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0.2 秒"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0.4 秒"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0.6 秒"</string>
     <string name="slow_keys" msgid="2891452895499690837">"緩慢鍵"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"調整按鍵啟動時間"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"相黏鍵"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"一次按下快速鍵中的一個鍵,而非同時按住多個鍵"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"滑鼠按鍵"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"使用鍵盤控制游標"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"滑鼠反向捲動"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"向上捲動即可將頁面向下移動"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"調換左右鍵"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"將滑鼠左鍵當右鍵使用"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"鍵盤快速鍵"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"顯示快速鍵清單"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"工作設定檔鍵盤與工具"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"為「<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>」選擇新的輔助鍵:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"實體鍵盤無障礙功能"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"相黏鍵、篩選鍵、滑鼠鍵"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"<xliff:g id="IME_LABEL">%s</xliff:g> 版面配置"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"預設"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"預覽"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"標準選項"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"語言"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"字幕大小"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"字幕樣式"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"自訂選項"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"背景顏色"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"要解除連結此 VPN 嗎?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"中斷連線"</string>
     <string name="vpn_version" msgid="6344167191984400976">"版本"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"刪除 VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"要取代目前的 VPN 嗎?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"要設定保持開啟的 VPN 嗎?"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"搜尋設定"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"通訊錄, 儲存空間, 帳戶"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"「通訊錄」儲存空間"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"只限裝置"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"新聯絡人不會與帳戶同步"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"根據預設,系統會將聯絡人儲存至裝置並同步至你的帳戶"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"沒有預設帳戶"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"新增帳戶以開始使用"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index b34f354..c4790ff 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"公事包"</item>
-    <item msgid="184985872234062767">"古典建築"</item>
-    <item msgid="9189550412466785530">"公寓"</item>
-    <item msgid="2142527562511049422">"對話泡泡"</item>
-    <item msgid="2548100558260478605">"一群人"</item>
-    <item msgid="2270003903304578284">"燈泡"</item>
-    <item msgid="4793496619091161864">"日曆"</item>
-    <item msgid="5673625795644364100">"零打擾"</item>
-    <item msgid="1423820834865831361">"跑步的人"</item>
-    <item msgid="2037298830718732608">"高爾夫"</item>
-    <item msgid="2197835014443491074">"健身啞鈴"</item>
-    <item msgid="2730180105015616518">"游泳"</item>
-    <item msgid="2666922823253345958">"健行的人"</item>
-    <item msgid="8234880356472211396">"丟球的人"</item>
-    <item msgid="4642980625253001443">"踢球的人"</item>
-    <item msgid="4324795269518833500">"遊戲控制器"</item>
-    <item msgid="7789966425125441125">"藝術家調色盤"</item>
-    <item msgid="663512680597461570">"雪花"</item>
-    <item msgid="7952183800501346803">"沙灘遮陽傘"</item>
-    <item msgid="799139025758265891">"工作坊工具"</item>
-    <item msgid="1330084588359129896">"帳篷"</item>
-    <item msgid="3861584909935022342">"電影膠卷"</item>
-    <item msgid="5827426100157335512">"書籍"</item>
-    <item msgid="8585828346253128384">"蓮花"</item>
-    <item msgid="8788370542815300188">"人的思維"</item>
-    <item msgid="7287354964767553293">"耳機"</item>
-    <item msgid="2530059623783800987">"電視"</item>
-    <item msgid="5307182323469376758">"火車"</item>
-    <item msgid="4903790544026923026">"車輛"</item>
-    <item msgid="5010405583912314582">"刀叉"</item>
-    <item msgid="8939998598599064900">"購物車"</item>
-    <item msgid="3379605903308731893">"兒童"</item>
-    <item msgid="7808668968550293112">"動物爪子"</item>
-    <item msgid="1000692647524056504">"星號徽章"</item>
-    <item msgid="8270261073421676502">"兩個人"</item>
-    <item msgid="5767782819651505460">"星星"</item>
-    <item msgid="4368451291862729334">"心形"</item>
-    <item msgid="2613199102208419986">"房屋"</item>
-    <item msgid="3022279986430275040">"半月"</item>
-    <item msgid="5421089790869483206">"時鐘"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index ff49870..e745267 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"使用網路和無線訊號自動設定"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"自動判定時區"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"根據附近的行動網路自動設定"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"使用裝置位置資訊自動設定 (如有)。這個選項可能還需要有效的 Wi-Fi 連線。"</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"使用地區設定預設值"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"使用 24 小時格式"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"時間"</string>
@@ -1946,26 +1947,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"無障礙"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"實體鍵盤"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"彈回鍵"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"鍵盤會忽略快速重複按下同一按鍵的動作"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"彈回鍵門檻"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"選擇鍵盤忽略重複按下按鍵的時間長度"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0.2 秒"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0.4 秒"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0.6 秒"</string>
     <string name="slow_keys" msgid="2891452895499690837">"延遲感應鍵"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"調整按鍵啟動時間"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"相黏鍵"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"一次按下快速鍵中的一個按鍵,而非同時按住多個按鍵"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"滑鼠按鍵"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"使用鍵盤控制游標"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"滑鼠反向捲動"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"向上捲動即可將頁面向下移動"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"交換左右按鍵"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"將滑鼠左鍵做為右鍵使用"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"鍵盤快速鍵"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"顯示快速鍵清單"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"工作資料夾鍵盤和工具"</string>
@@ -2034,9 +2031,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"為「<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>」選擇新的輔助鍵:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"實體鍵盤無障礙功能"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"相黏鍵、彈回鍵、滑鼠按鍵"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"「<xliff:g id="IME_LABEL">%s</xliff:g>」版面配置"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"預設"</string>
@@ -2442,8 +2443,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"預覽"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"標準選項"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"語言"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"字幕大小"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"字幕樣式"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"自訂選項"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"背景顏色"</string>
@@ -2987,6 +2987,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"要中斷這個 VPN 連線嗎?"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"中斷連線"</string>
     <string name="vpn_version" msgid="6344167191984400976">"版本"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"清除 VPN 設定檔"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"要取代現有的 VPN 嗎?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"要設定永久連線 VPN 嗎?"</string>
@@ -5462,13 +5464,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"搜尋設定"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"聯絡人, 儲存空間, 帳戶"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"聯絡人儲存空間"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"僅限裝置"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"新的聯絡人資料不會與帳戶同步"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"系統預設會將聯絡人資料儲存到裝置,並同步到你的帳戶"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"沒有預設帳戶"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"如要開始使用,請新增帳戶"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index 9b0b52d..efb0766 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -498,48 +498,7 @@
     <!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
     <!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
     <!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
-  <string-array name="zen_mode_icon_options_descriptions">
-    <item msgid="1216815120972438676">"Isikhwama"</item>
-    <item msgid="184985872234062767">"Isakhiwo sakudala"</item>
-    <item msgid="9189550412466785530">"Isakhiwo sefulethi"</item>
-    <item msgid="2142527562511049422">"Ibhamuza yenkulumo"</item>
-    <item msgid="2548100558260478605">"Iqembu labantu"</item>
-    <item msgid="2270003903304578284">"Isibani sokukhanyisa"</item>
-    <item msgid="4793496619091161864">"Ikhalenda"</item>
-    <item msgid="5673625795644364100">"Ungaphazamisi"</item>
-    <item msgid="1423820834865831361">"Umuntu ogijimayo"</item>
-    <item msgid="2037298830718732608">"Igalufu"</item>
-    <item msgid="2197835014443491074">"Izinsimbi zasejimini"</item>
-    <item msgid="2730180105015616518">"Ukubhukuda"</item>
-    <item msgid="2666922823253345958">"Umuntu ogibela intaba"</item>
-    <item msgid="8234880356472211396">"Umuntu ophonsa ibhola"</item>
-    <item msgid="4642980625253001443">"Umuntu okhahlelayo"</item>
-    <item msgid="4324795269518833500">"Isilawuli segeyimu"</item>
-    <item msgid="7789966425125441125">"Uhlu lwemifanekiso yemibala yeciko"</item>
-    <item msgid="663512680597461570">"ISnowflake"</item>
-    <item msgid="7952183800501346803">"Isambulela sasebhishi"</item>
-    <item msgid="799139025758265891">"Amathuluzi asendaweni yomsebenzi"</item>
-    <item msgid="1330084588359129896">"Itende"</item>
-    <item msgid="3861584909935022342">"Ireel yefilimu"</item>
-    <item msgid="5827426100157335512">"Incwadi"</item>
-    <item msgid="8585828346253128384">"Imbali yelotus"</item>
-    <item msgid="8788370542815300188">"Ingqondo yomuntu"</item>
-    <item msgid="7287354964767553293">"Amaheadphone"</item>
-    <item msgid="2530059623783800987">"I-TV"</item>
-    <item msgid="5307182323469376758">"Isitimela"</item>
-    <item msgid="4903790544026923026">"Imoto"</item>
-    <item msgid="5010405583912314582">"Imfoloko nommese"</item>
-    <item msgid="8939998598599064900">"Ubhasikidi wokuthenga"</item>
-    <item msgid="3379605903308731893">"Ingane"</item>
-    <item msgid="7808668968550293112">"Isidladla sesilwane"</item>
-    <item msgid="1000692647524056504">"Ibheji lenkanyezi"</item>
-    <item msgid="8270261073421676502">"Abantu ababili"</item>
-    <item msgid="5767782819651505460">"Inkanyezi"</item>
-    <item msgid="4368451291862729334">"Inhliziyo"</item>
-    <item msgid="2613199102208419986">"Indlu"</item>
-    <item msgid="3022279986430275040">"Inyanga ewuhhafu"</item>
-    <item msgid="5421089790869483206">"Iwashi"</item>
-  </string-array>
+    <!-- no translation found for zen_mode_icon_options_descriptions:20 (8112685757657659269) -->
   <string-array name="display_over_apps_permission_change_exempt">
   </string-array>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 441df39..e83798f 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -250,7 +250,8 @@
     <string name="date_time_auto_summary" msgid="8294938565417729698">"Setha ngokuzenzakalela usebenzisa inethiwekhi yakho namasignali angenantambo"</string>
     <string name="zone_auto_title" msgid="3520584257065861479">"Izoni yesikhathi ezenzekelayo"</string>
     <string name="zone_auto_title_summary" msgid="6540356783943375071">"Setha ngokuzenzekelayo ngokusekelwe kumanethiwekhi eselula aseduze nawe"</string>
-    <string name="auto_zone_requires_location_summary" msgid="8751995978350701451">"Setha ngokuzenzakalela usebenzisa indawo yedivayisi yakho, uma ikhona. Uxhumo lwe-Wifi olusebenzayo nalo lungadingeka."</string>
+    <!-- no translation found for auto_zone_requires_location_summary (2366567167956530124) -->
+    <skip />
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Sebenzisa okuzenzakalelayo kwasendaweni"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Sebenzisa ifomethi ye-24 amahora"</string>
     <string name="date_time_set_time_title" msgid="2870083415922991906">"Isikhathi"</string>
@@ -1947,26 +1948,22 @@
     <string name="keyboard_a11y_category" msgid="8230758278046841469">"Ukufinyeleleka"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Ikhibhodi ephathekayo"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Okhiye bokubuyisela emuva"</string>
-    <!-- no translation found for bounce_keys_summary (7418024428905737729) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_title (4088646362538368693) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_subtitle (5640575860258120026) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_200 (7876774697200082558) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_400 (8146580138675322657) -->
-    <skip />
-    <!-- no translation found for bounce_keys_dialog_option_600 (6166166103942612488) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7418024428905737729">"Ikhibhodi iziba ukucindezela okuphindaphindiwe okusheshayo kwenkinobho efanayo"</string>
+    <string name="bounce_keys_dialog_title" msgid="4088646362538368693">"Ukhawulo wokhiye abaphindwayo"</string>
+    <string name="bounce_keys_dialog_subtitle" msgid="5640575860258120026">"Khetha inkathi yesikhathi ikhibhodi yakho ezoziba ngaso ukucindezela kwezinkinobho okuphindaphindiwe"</string>
+    <string name="bounce_keys_dialog_option_200" msgid="7876774697200082558">"0.2s"</string>
+    <string name="bounce_keys_dialog_option_400" msgid="8146580138675322657">"0.4s"</string>
+    <string name="bounce_keys_dialog_option_600" msgid="6166166103942612488">"0.6s"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Okhiye abahamba kancane"</string>
-    <!-- no translation found for slow_keys_summary (2914214326648535377) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="2914214326648535377">"Ilungisa isikhathi okusithathayo ukuze ukucindezela inkinobho kusebenze"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Okhiye abanamathelayo"</string>
     <string name="sticky_keys_summary" msgid="1844953803625480623">"Cindezela inkinobho eyodwa ngesikhathi ukuze uthole izinqamuleli esikhundleni sokubamba izinkinobho ndawonye"</string>
     <string name="mouse_keys" msgid="6237254627808525540">"Okhiye bemouse"</string>
-    <!-- no translation found for mouse_keys_summary (7030731235143286467) -->
-    <skip />
+    <string name="mouse_keys_summary" msgid="7030731235143286467">"Sebenzisa ikhibhodi yakho ukuze ulawule isikhombi"</string>
+    <string name="mouse_reverse_vertical_scrolling" msgid="154907817154779952">"Ukuskrola ngokuphendukezela igundane"</string>
+    <string name="mouse_reverse_vertical_scrolling_summary" msgid="3386655598642587942">"Skrola uye phezulu bese uyisa ikhasi ezansi"</string>
+    <string name="mouse_swap_primary_button" msgid="3028204969091057207">"Shintshanisa izinkinobho kwesokunxele nakwesokudla"</string>
+    <string name="mouse_swap_primary_button_summary" msgid="3276638019321067902">"Sebenzisa inkinobho yemawusi kwesokunxele njengesokudla sakho"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Izinqamuleli zekhibhodi"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Bonisa uhlu lwezinqamuleli"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Amakhibhodi ephrofayela yomsebenzi namathuluzi"</string>
@@ -2035,9 +2032,13 @@
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Khetha ukhiye omusha we-<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
     <string name="keyboard_a11y_settings" msgid="2564659018555385728">"Ukufinyeleleka kwekhibhodi engokoqobo"</string>
     <string name="keyboard_a11y_settings_summary" msgid="1698531156574098722">"Okhiye abanamathelayo, okhiye Bokubuyisela emuva, okhiye Bemawusi"</string>
-    <!-- no translation found for keyboard_repeat_key_title (3641350808120194549) -->
+    <!-- no translation found for keyboard_repeat_keys_title (6346877755243280735) -->
     <skip />
-    <!-- no translation found for keyboard_repeat_key_summary (3970350989341158854) -->
+    <!-- no translation found for keyboard_repeat_keys_timeout_title (3411871149974652293) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_delay_title (7323531750483922943) -->
+    <skip />
+    <!-- no translation found for keyboard_repeat_keys_summary (8972905345211768313) -->
     <skip />
     <string name="ime_label_title" msgid="8994569521516807168">"Isakhiwo se-<xliff:g id="IME_LABEL">%s</xliff:g>"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Okuzenzakalelayo"</string>
@@ -2443,8 +2444,7 @@
     <string name="captioning_preview_title" msgid="2888561631323180535">"Buka kuqala"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Izinketho ezijwayelekile"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Ulimi"</string>
-    <!-- no translation found for captioning_text_size (5764254558945371745) -->
-    <skip />
+    <string name="captioning_text_size" msgid="5764254558945371745">"Usayizi wegama-ncazo"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Isitayela segama-ncazo"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"Izinketho ezingokwezifiso"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"Umbala ongemuva"</string>
@@ -2988,6 +2988,8 @@
     <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Nqamula le-VPN"</string>
     <string name="vpn_disconnect" msgid="7753808961085867345">"Nqamula"</string>
     <string name="vpn_version" msgid="6344167191984400976">"Uhlobo"</string>
+    <!-- no translation found for vpn_version_info (5717671228402924155) -->
+    <skip />
     <string name="vpn_forget_long" msgid="729132269203870205">"Khohlwa i-VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Shintshanisa i-VPN ekhona?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Setha i-VPN ehlala ivuliwe?"</string>
@@ -5463,13 +5465,13 @@
     <string name="homepage_search" msgid="6759334912284663559">"Amasethingi Okusesha"</string>
     <string name="keywords_contacts_storage" msgid="9061213057165337893">"oxhumana nabo, isitoreji, i-akhawunti"</string>
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Isitoreji soxhumana nabo"</string>
-    <!-- no translation found for contacts_storage_device_only_preference_label (970250816918108264) -->
-    <skip />
-    <!-- no translation found for contacts_storage_device_only_preference_summary (2339782491812039153) -->
-    <skip />
-    <!-- no translation found for contacts_storage_selection_message (8082077300632059003) -->
-    <skip />
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Idivayisi kuphela"</string>
+    <string name="contacts_storage_device_only_preference_summary" msgid="2339782491812039153">"Oxhumana nabo abasha ngeke bavumelaniswe ne-akhawunti"</string>
+    <string name="contacts_storage_selection_message" msgid="8082077300632059003">"Oxhumana nabo bazolondolozwa kudivayisi yakho futhi bavumelaniswe ne-akhawunti yakho ngokuzenzakalelayo"</string>
     <string name="contacts_storage_no_account_set" msgid="1548101985417720782">"Ayikho isethi ezenzakalelayo"</string>
-    <!-- no translation found for contacts_storage_first_time_add_account_message (5161093169928132323) -->
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Faka i-akhawunti ukuze uqalise"</string>
+    <!-- no translation found for search_gesture_feature_title (7037117019612710960) -->
+    <skip />
+    <!-- no translation found for search_gesture_feature_summary (1793056495030564014) -->
     <skip />
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 8e5519f..ed0bce4 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1551,7 +1551,7 @@
         <item>@*android:drawable/ic_zen_mode_icon_snowflake</item>
         <item>@*android:drawable/ic_zen_mode_icon_beach</item>
         <item>@*android:drawable/ic_zen_mode_icon_workshop</item>
-        <item>@*android:drawable/ic_zen_mode_icon_camping</item>
+        <item>@*android:drawable/ic_zen_mode_icon_piano</item>
         <item>@*android:drawable/ic_zen_mode_type_theater</item> <!-- Film reel -->
         <item>@*android:drawable/ic_zen_mode_icon_book</item>
         <!-- Wellbeing -->
@@ -1602,7 +1602,7 @@
         <item>Snowflake</item>
         <item>Beach umbrella</item>
         <item>Workshop tools</item>
-        <item>Tent</item>
+        <item>Piano</item>
         <item>Film reel</item>
         <item>Book</item>
         <!-- Wellbeing -->
diff --git a/res/values/config.xml b/res/values/config.xml
index 065d28a..09f941f 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -836,4 +836,7 @@
 
     <!-- Package name for diagnostics app. -->
     <string name="config_device_diagnostics_package_name" translatable="false">com.android.devicediagnostics</string>
+
+    <!-- Package name for Linux terminal app -->
+    <string name="config_linux_terminal_app_package_name" translatable="false">com.android.virtualization.terminal</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 42eaed4..b62df60 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4525,12 +4525,17 @@
     <string name="bounce_keys_dialog_title">Bounce key threshold</string>
     <!-- Subtitle for the 'Bounce keys' threshold dialog. [CHAR LIMIT=300] -->
     <string name="bounce_keys_dialog_subtitle">Choose the duration of time your keyboard ignores repeated key presses</string>
-    <!-- Option title for the 'Bounce keys' threshold dialog for 200 millisecond. [CHAR LIMIT=35] -->
-    <string name="bounce_keys_dialog_option_200">0.2s</string>
-    <!-- Option title for the 'Bounce keys' threshold dialog for 400 millisecond. [CHAR LIMIT=35] -->
-    <string name="bounce_keys_dialog_option_400">0.4s</string>
-    <!-- Option title for the 'Bounce keys' threshold dialog for 600 millisecond. [CHAR LIMIT=35] -->
-    <string name="bounce_keys_dialog_option_600">0.6s</string>
+    <!-- Option title for the input setting keys threshold dialog for 200 millisecond. [CHAR LIMIT=35] -->
+    <string name="input_setting_keys_dialog_option_200">0.2s</string>
+    <!-- Option title for the input setting keys threshold dialog for 400 millisecond. [CHAR LIMIT=35] -->
+    <string name="input_setting_keys_dialog_option_400">0.4s</string>
+    <!-- Option title for the input setting keys threshold dialog for 600 millisecond. [CHAR LIMIT=35] -->
+    <string name="input_setting_keys_dialog_option_600">0.6s</string>
+    <!-- Option title for the input setting keys threshold dialog for custom value. [CHAR LIMIT=35] -->
+    <string name="input_setting_keys_custom_title">Custom</string>
+    <!-- Option subtitle for the input setting keys threshold dialog for custom value. [CHAR LIMIT=35] -->
+    <string name="input_setting_keys_custom_value">custom value</string>
+
     <!-- Title for the 'Slow keys' preference switch. [CHAR LIMIT=35] -->
     <string name="slow_keys">Slow keys</string>
     <!-- Summary text for the 'Slow keys' preference sub-screen. [CHAR LIMIT=300] -->
@@ -13708,7 +13713,6 @@
     <!-- Learn more link for audio sharing qrcode [CHAR LIMIT=none]-->
     <string name="audio_streams_qr_code_help_with_link"><annotation id="link">Need help?</annotation></string>
 
-
     <!-- url for learning more about bluetooth audio sharing -->
     <string name="help_url_audio_sharing" translatable="false"></string>
 
@@ -13729,4 +13733,11 @@
     <string name="contacts_storage_no_account_set">No default set</string>
     <!-- Text for add account selection message when no account has been added [CHAR LIMIT=100] -->
     <string name="contacts_storage_first_time_add_account_message">Add an account to get started</string>
+
+    <!-- Circle to Search (shared between all entrypoints) -->
+    <!-- Name of Google's new feature to circle to search anything on your phone screen,
+         without switching apps. Also used as the setting title. [CHAR LIMIT=60] -->
+    <string name="search_gesture_feature_title">Circle to Search</string>
+    <!-- Summary text for press and hold nav handle OR home button to invoke Circle to Search. [CHAR LIMIT=NONE] -->
+    <string name="search_gesture_feature_summary">Touch and hold the Home button or the navigation handle to search using the content on your screen.</string>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 70d3670..5bcb805 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -455,11 +455,13 @@
     </style>
 
     <style name="SearchBarStyle">
+        <item name="android:theme">@style/Theme.MaterialComponents.DayNight</item>
         <item name="cardCornerRadius">@dimen/search_bar_corner_radius</item>
         <item name="cardElevation">0dp</item>
     </style>
 
     <style name="SearchBarStyle_v2">
+        <item name="android:theme">@style/Theme.MaterialComponents.DayNight</item>
         <item name="cardCornerRadius">40dp</item>
         <item name="cardElevation">0dp</item>
         <item name="strokeWidth">1dp</item>
diff --git a/res/xml/accessibility_system_controls.xml b/res/xml/accessibility_system_controls.xml
index 460214f..a8cb1bb 100644
--- a/res/xml/accessibility_system_controls.xml
+++ b/res/xml/accessibility_system_controls.xml
@@ -20,6 +20,9 @@
     android:persistent="false"
     android:title="@string/accessibility_system_controls_title">
 
+    <!-- The item is not specific to Accessibility.
+        The same entry is under System, which is unlikely to be removed,
+        so this is not searchable. -->
     <Preference
         android:fragment="com.android.settings.gestures.SystemNavigationGestureSettings"
         android:key="gesture_system_navigation_input_summary_accessibility"
@@ -28,6 +31,9 @@
         settings:searchable="false"
         settings:controller="com.android.settings.gestures.SystemNavigationPreferenceController"/>
 
+    <!-- The item is not specific to Accessibility.
+        The same entry is under System > Gesture, which is unlikely to be removed,
+        so this is not searchable. -->
     <Preference
         android:fragment="com.android.settings.gestures.OneHandedSettings"
         android:key="gesture_system_navigation_one_handed_accessibility"
@@ -43,21 +49,28 @@
         settings:controller="com.android.settings.accessibility.PowerButtonEndsCallPreferenceController"/>
 
     <!-- Standard auto-rotation preference that will be shown when device state based auto-rotation
-         settings are NOT available. -->
+         settings are NOT available.
+         The item is not specific to Accessibility.
+         The same entry is under Display & touch, which is unlikely to be removed,
+         so this is not searchable.-->
     <SwitchPreferenceCompat
         android:key="toggle_lock_screen_rotation_preference"
         android:persistent="false"
         android:title="@string/accelerometer_title"
+        settings:searchable="false"
         settings:controller="com.android.settings.accessibility.LockScreenRotationPreferenceController"/>
 
     <!-- Auto-rotation preference that will be shown when device state based auto-rotation settings
-         are available. -->
+         are available.
+         The item is not specific to Accessibility.
+         The same entry is under Display & touch, which is unlikely to be removed,
+         so this is not searchable. -->
     <Preference
         android:key="device_state_auto_rotate_accessibility"
         android:persistent="false"
         android:title="@string/accelerometer_title"
         android:fragment="com.android.settings.display.DeviceStateAutoRotateDetailsFragment"
-        settings:keywords="@string/keywords_auto_rotate"
+        settings:searchable="false"
         settings:controller="com.android.settings.display.DeviceStateAutoRotateOverviewController"/>
 
 </PreferenceScreen>
diff --git a/res/xml/button_navigation_settings.xml b/res/xml/button_navigation_settings.xml
index 1de011c..1f89539 100644
--- a/res/xml/button_navigation_settings.xml
+++ b/res/xml/button_navigation_settings.xml
@@ -28,7 +28,8 @@
         settings:searchable="false"
         settings:dynamicColor="true"
         settings:lottie_imageAssetsFolder="button_nav_menu"
-        settings:lottie_rawRes="@raw/lottie_button_nav_menu"/>
+        settings:lottie_rawRes="@raw/lottie_button_nav_menu"
+        settings:controller="com.android.settings.gestures.ButtonNavigationSettingsAssistController"/>
 
     <SwitchPreferenceCompat
         android:key="assistant_long_press_home_gesture"
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index f494795..a4addf6 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -200,6 +200,11 @@
             android:summary="@string/enable_terminal_summary" />
 
         <SwitchPreferenceCompat
+            android:key="enable_linux_terminal"
+            android:title="@string/enable_linux_terminal_title"
+            android:summary="@string/enable_linux_terminal_summary" />
+
+        <SwitchPreferenceCompat
             android:key="bugreport_in_power"
             android:title="@string/bugreport_in_power"
             android:summary="@string/bugreport_in_power_summary" />
diff --git a/res/xml/physical_keyboard_a11y_settings.xml b/res/xml/physical_keyboard_a11y_settings.xml
index 62479f9..3bfe199 100644
--- a/res/xml/physical_keyboard_a11y_settings.xml
+++ b/res/xml/physical_keyboard_a11y_settings.xml
@@ -19,35 +19,35 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/keyboard_a11y_settings"
-    android:key="physical_keyboard_a11y">
+    android:key="physical_keyboard_a11y_page">
 
     <PreferenceCategory
-        android:key="keyboard_a11y_category"
+        android:key="keyboard_a11y_page_category"
         android:title="@string/keyboard_a11y_category">
 
         <SwitchPreferenceCompat
-            android:key="accessibility_sticky_keys"
+            android:key="keyboard_a11y_page_sticky_keys"
             android:title="@string/sticky_keys"
             android:summary="@string/sticky_keys_summary"
             android:defaultValue="false"
             settings:controller="com.android.settings.inputmethod.KeyboardAccessibilityStickyKeysController"/>
 
         <com.android.settingslib.PrimarySwitchPreference
-            android:key="accessibility_bounce_keys"
+            android:key="keyboard_a11y_page_bounce_keys"
             android:title="@string/bounce_keys"
             android:summary="@string/bounce_keys_summary"
             android:defaultValue="false"
             settings:controller="com.android.settings.inputmethod.KeyboardAccessibilityBounceKeysController"/>
 
-        <SwitchPreferenceCompat
-            android:key="accessibility_slow_keys"
+        <com.android.settingslib.PrimarySwitchPreference
+            android:key="keyboard_a11y_page_slow_keys"
             android:title="@string/slow_keys"
             android:defaultValue="false"
             android:summary="@string/slow_keys_summary"
             settings:controller="com.android.settings.inputmethod.KeyboardAccessibilitySlowKeysController" />
 
         <SwitchPreferenceCompat
-            android:key="accessibility_mouse_keys"
+            android:key="keyboard_a11y_page_mouse_keys"
             android:title="@string/mouse_keys"
             android:summary="@string/mouse_keys_summary"
             android:defaultValue="false"
diff --git a/res/xml/power_background_usage_detail.xml b/res/xml/power_background_usage_detail.xml
index 5c7b6a5..32d80b5 100644
--- a/res/xml/power_background_usage_detail.xml
+++ b/res/xml/power_background_usage_detail.xml
@@ -25,22 +25,25 @@
         android:layout="@layout/settings_entity_header"
         android:selectable="false"/>
 
-    <com.android.settingslib.widget.MainSwitchPreference
-        android:key="allow_background_usage"
-        android:title="@string/manager_battery_usage_allow_background_usage_title"
-        settings:controller="com.android.settings.fuelgauge.AllowBackgroundPreferenceController"/>
+    <PreferenceCategory
+        android:key="battery_optimization_mode_category"
+        android:layout="@layout/settingslib_preference_category_no_title"
+        settings:controller="com.android.settings.fuelgauge.BatteryOptimizationModePreferenceController">
 
-    <com.android.settingslib.widget.SelectorWithWidgetPreference
-        android:key="optimized_preference"
-        android:title="@string/manager_battery_usage_optimized_title"
-        android:summary="@string/manager_battery_usage_optimized_summary"
-        settings:controller="com.android.settings.fuelgauge.OptimizedPreferenceController"/>
+        <com.android.settingslib.widget.MainSwitchPreference
+            android:key="background_usage_allowability_switch"
+            android:title="@string/manager_battery_usage_allow_background_usage_title"/>
 
-    <com.android.settingslib.widget.SelectorWithWidgetPreference
-        android:key="unrestricted_preference"
-        android:title="@string/manager_battery_usage_unrestricted_title"
-        android:summary="@string/manager_battery_usage_unrestricted_summary"
-        settings:controller="com.android.settings.fuelgauge.UnrestrictedPreferenceController"/>
+        <com.android.settingslib.widget.SelectorWithWidgetPreference
+            android:key="optimized_preference"
+            android:title="@string/manager_battery_usage_optimized_title"
+            android:summary="@string/manager_battery_usage_optimized_summary"/>
+
+        <com.android.settingslib.widget.SelectorWithWidgetPreference
+            android:key="unrestricted_preference"
+            android:title="@string/manager_battery_usage_unrestricted_title"
+            android:summary="@string/manager_battery_usage_unrestricted_summary"/>
+    </PreferenceCategory>
 
     <com.android.settingslib.widget.FooterPreference
         android:key="app_usage_footer_preference"
diff --git a/res/xml/power_usage_detail.xml b/res/xml/power_usage_detail.xml
index f3b30b6..655dbc5 100644
--- a/res/xml/power_usage_detail.xml
+++ b/res/xml/power_usage_detail.xml
@@ -48,12 +48,12 @@
 
     <PreferenceCategory
         android:title="@string/manager_battery_usage_category_title"
-        android:key="manage_battery_usage_category">
+        android:key="background_usage_allowability_category"
+        settings:controller="com.android.settings.fuelgauge.BackgroundUsageAllowabilityPreferenceController">
 
         <com.android.settingslib.PrimarySwitchPreference
-            android:key="allow_background_usage"
-            android:title="@string/manager_battery_usage_allow_background_usage_title"
-            settings:controller="com.android.settings.fuelgauge.AllowBackgroundPreferenceController"/>
+            android:key="background_usage_allowability_switch"
+            android:title="@string/manager_battery_usage_allow_background_usage_title"/>
 
     </PreferenceCategory>
 
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index 15312c8..eed4406 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -170,7 +170,7 @@
 
     <!-- Dial pad tones -->
     <SwitchPreferenceCompat
-        android:key="dial_pad_tones"
+        android:key="dtmf_tone"
         android:title="@string/dial_pad_tones_title"
         android:order="-50"/>
 
diff --git a/res/xml/system_navigation_gesture_settings.xml b/res/xml/system_navigation_gesture_settings.xml
index a75875b..8919a40 100644
--- a/res/xml/system_navigation_gesture_settings.xml
+++ b/res/xml/system_navigation_gesture_settings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2018 The Android Open Source Project
+  Copyright (C) 2024 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.
@@ -19,4 +19,15 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/system_navigation_title"
-    settings:keywords="@string/keywords_system_navigation"/>
+    settings:keywords="@string/keywords_system_navigation">
+
+    <SwitchPreferenceCompat
+        android:key="search_gesture_press_hold"
+        android:title="@string/search_gesture_feature_title"
+        android:summary="@string/search_gesture_feature_summary"
+        android:order="100"
+        settings:allowDividerAbove="true"
+        settings:controller="com.android.settings.gestures.NavigationSettingsContextualSearchController"
+        settings:highlightableMenuKey="@string/menu_key_system" />
+
+</PreferenceScreen>
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index a095006..10763d0 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -97,9 +97,8 @@
                 }
             };
 
-    @Nullable
     @Override
-    public String getPreferenceScreenBindingKey(@NonNull Context context) {
+    public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
         return DisplayScreen.KEY;
     }
 }
diff --git a/src/com/android/settings/LegalSettings.java b/src/com/android/settings/LegalSettings.java
index e48da26..533dde3 100644
--- a/src/com/android/settings/LegalSettings.java
+++ b/src/com/android/settings/LegalSettings.java
@@ -50,9 +50,8 @@
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider(R.xml.about_legal);
 
-    @Nullable
     @Override
-    public String getPreferenceScreenBindingKey(@NonNull Context context) {
+    public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
         return LegalSettingsScreen.KEY;
     }
 }
diff --git a/src/com/android/settings/RegulatoryInfoDisplayActivity.kt b/src/com/android/settings/RegulatoryInfoDisplayActivity.kt
index 6b5ccc7..4038aa8 100644
--- a/src/com/android/settings/RegulatoryInfoDisplayActivity.kt
+++ b/src/com/android/settings/RegulatoryInfoDisplayActivity.kt
@@ -69,6 +69,6 @@
     private fun getRegulatoryText(): CharSequence? {
         val regulatoryInfoText = resources.getText(R.string.regulatory_info_text)
         if (regulatoryInfoText.isNotBlank()) return regulatoryInfoText
-        return featureFactory.hardwareInfoFeatureProvider?.countryIfOriginLabel
+        return featureFactory.hardwareInfoFeatureProvider?.countryOfOriginLabel
     }
 }
diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java
index f86e29f..2178b60 100644
--- a/src/com/android/settings/ResetNetwork.java
+++ b/src/com/android/settings/ResetNetwork.java
@@ -47,7 +47,6 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
-import com.android.internal.telephony.flags.Flags;
 import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.network.ResetNetworkRestrictionViewBuilder;
@@ -142,13 +141,10 @@
         Context context = getContext();
         boolean resetSims = false;
 
-        // TODO(b/317276437) Simplify the logic once flag is released
         int resetOptions = ResetNetworkRequest.RESET_CONNECTIVITY_MANAGER
-                        | ResetNetworkRequest.RESET_VPN_MANAGER;
-        if (Flags.resetMobileNetworkSettings()) {
-            resetOptions |= ResetNetworkRequest.RESET_IMS_STACK;
-            resetOptions |= ResetNetworkRequest.RESET_PHONE_PROCESS;
-        }
+                        | ResetNetworkRequest.RESET_VPN_MANAGER
+                        | ResetNetworkRequest.RESET_IMS_STACK
+                        | ResetNetworkRequest.RESET_PHONE_PROCESS;
         ResetNetworkRequest request = new ResetNetworkRequest(resetOptions);
         if (mSubscriptions != null && mSubscriptions.size() > 0) {
             int selectedIndex = mSubscriptionSpinner.getSelectedItemPosition();
@@ -156,9 +152,7 @@
             int subId = subscription.getSubscriptionId();
             request.setResetTelephonyAndNetworkPolicyManager(subId)
                     .setResetApn(subId);
-            if (Flags.resetMobileNetworkSettings()) {
-                request.setResetImsSubId(subId);
-            }
+            request.setResetImsSubId(subId);
         }
         if (mEsimContainer.getVisibility() == View.VISIBLE && mEsimCheckbox.isChecked()) {
             resetSims = true;
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index f7110b4..b04f3af 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -514,4 +514,5 @@
 
     public static class HearingDevicesActivity extends SettingsActivity { /* empty */ }
     public static class HearingDevicesPairingActivity extends SettingsActivity { /* empty */ }
+    public static class ContactsStorageSettingsActivity extends SettingsActivity { /* empty */ }
 }
diff --git a/src/com/android/settings/SettingsService.kt b/src/com/android/settings/SettingsService.kt
new file mode 100644
index 0000000..2cd706b
--- /dev/null
+++ b/src/com/android/settings/SettingsService.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2024 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
+
+import android.content.Intent
+import android.os.IBinder
+import com.android.settings.flags.Flags
+import com.android.settingslib.service.PreferenceService
+
+/** Service to expose settings APIs. */
+class SettingsService : PreferenceService({ _, _, _ -> true }) {
+
+    override fun onBind(intent: Intent): IBinder? {
+        return if (!Flags.catalystService()) null else super.onBind(intent)
+    }
+}
diff --git a/src/com/android/settings/accessibility/ColorAndMotionFragment.java b/src/com/android/settings/accessibility/ColorAndMotionFragment.java
index 4ea2226..7a7c21d 100644
--- a/src/com/android/settings/accessibility/ColorAndMotionFragment.java
+++ b/src/com/android/settings/accessibility/ColorAndMotionFragment.java
@@ -17,12 +17,15 @@
 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.os.Handler;
 import android.provider.Settings;
 import android.view.accessibility.Flags;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.TwoStatePreference;
@@ -148,6 +151,12 @@
         }
     }
 
+    @Nullable
+    @Override
+    public String getPreferenceScreenBindingKey(@NonNull Context context) {
+        return ColorAndMotionScreen.KEY;
+    }
+
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider(R.xml.accessibility_color_and_motion);
 }
diff --git a/src/com/android/settings/accessibility/ColorAndMotionScreen.kt b/src/com/android/settings/accessibility/ColorAndMotionScreen.kt
new file mode 100644
index 0000000..20a71e3
--- /dev/null
+++ b/src/com/android/settings/accessibility/ColorAndMotionScreen.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2024 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.Context
+import com.android.settings.flags.Flags
+import com.android.settings.R
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenCreator
+
+@ProvidePreferenceScreen
+class ColorAndMotionScreen : PreferenceScreenCreator {
+    override val key: String = KEY
+    override val title: Int = R.string.accessibility_color_and_motion_title
+
+    override fun isFlagEnabled(context: Context) = Flags.catalystAccessibilityColorAndMotion()
+
+    override fun hasCompleteHierarchy(): Boolean = false
+
+    override fun fragmentClass() = ColorAndMotionFragment::class.java
+
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {}
+
+
+    companion object {
+        const val KEY = "accessibility_color_and_motion"
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/accessibility/DisplaySizeData.java b/src/com/android/settings/accessibility/DisplaySizeData.java
index 77ae897..15aeb6b 100644
--- a/src/com/android/settings/accessibility/DisplaySizeData.java
+++ b/src/com/android/settings/accessibility/DisplaySizeData.java
@@ -35,7 +35,7 @@
         super(context);
 
         mDensity = new DisplayDensityUtils(getContext());
-        final int initialIndex = mDensity.getCurrentIndexForDefaultDisplay();
+        final int initialIndex = mDensity.getCurrentIndex();
         if (initialIndex < 0) {
             // Failed to obtain default density, which means we failed to
             // connect to the window manager service. Just use the current
@@ -46,9 +46,9 @@
             setInitialIndex(0);
             setValues(Collections.singletonList(densityDpi));
         } else {
-            setDefaultValue(mDensity.getDefaultDensityForDefaultDisplay());
+            setDefaultValue(mDensity.getDefaultDensity());
             setInitialIndex(initialIndex);
-            setValues(Arrays.stream(mDensity.getDefaultDisplayDensityValues()).boxed()
+            setValues(Arrays.stream(mDensity.getValues()).boxed()
                     .collect(Collectors.toList()));
         }
     }
diff --git a/src/com/android/settings/accessibility/TextReadingPreferenceFragment.java b/src/com/android/settings/accessibility/TextReadingPreferenceFragment.java
index a90af21..9fc9e10 100644
--- a/src/com/android/settings/accessibility/TextReadingPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/TextReadingPreferenceFragment.java
@@ -30,6 +30,8 @@
 import android.widget.Toast;
 
 import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 
 import com.android.settings.R;
@@ -313,4 +315,9 @@
 
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider(R.xml.accessibility_text_reading_options);
+
+    @Override
+    public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
+        return TextReadingScreen.KEY;
+    }
 }
diff --git a/src/com/android/settings/accessibility/TextReadingScreen.kt b/src/com/android/settings/accessibility/TextReadingScreen.kt
new file mode 100644
index 0000000..8970d52
--- /dev/null
+++ b/src/com/android/settings/accessibility/TextReadingScreen.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2024 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.Context
+import com.android.settings.R
+import com.android.settings.flags.Flags
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenCreator
+
+@ProvidePreferenceScreen
+class TextReadingScreen : PreferenceScreenCreator {
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.accessibility_text_reading_options_title
+
+    override fun isFlagEnabled(context: Context) = Flags.catalystTextReadingScreen()
+
+    override fun fragmentClass() = TextReadingPreferenceFragment::class.java
+
+    override fun hasCompleteHierarchy() = false
+
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {}
+
+    companion object {
+        const val KEY = "text_reading_screen"
+    }
+}
diff --git a/src/com/android/settings/accessibility/VibrationIntensityScreen.kt b/src/com/android/settings/accessibility/VibrationIntensityScreen.kt
new file mode 100644
index 0000000..5d7d4fb
--- /dev/null
+++ b/src/com/android/settings/accessibility/VibrationIntensityScreen.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2024 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.Context
+import androidx.fragment.app.Fragment
+import com.android.settings.R
+import com.android.settings.flags.Flags
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenCreator
+
+@ProvidePreferenceScreen
+class VibrationIntensityScreen : PreferenceScreenCreator {
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.accessibility_vibration_settings_title
+
+    override fun isFlagEnabled(context: Context): Boolean = Flags.catalystVibrationIntensityScreen()
+
+    override fun hasCompleteHierarchy() = false
+
+    override fun fragmentClass(): Class<out Fragment>? =
+        VibrationIntensitySettingsFragment::class.java
+
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {}
+
+    companion object {
+        const val KEY = "vibration_intensity_screen"
+    }
+}
diff --git a/src/com/android/settings/accessibility/VibrationIntensitySettingsFragment.java b/src/com/android/settings/accessibility/VibrationIntensitySettingsFragment.java
index 1d24ec9..328bed9 100644
--- a/src/com/android/settings/accessibility/VibrationIntensitySettingsFragment.java
+++ b/src/com/android/settings/accessibility/VibrationIntensitySettingsFragment.java
@@ -25,6 +25,8 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -90,4 +92,9 @@
                     return VibrationIntensitySettingsFragment.isPageSearchEnabled(context);
                 }
             };
+
+    @Override
+    public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
+        return VibrationIntensityScreen.KEY;
+    }
 }
diff --git a/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java b/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java
index d04b34a..f05b157 100644
--- a/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java
@@ -61,6 +61,7 @@
 import com.android.settings.R;
 import com.android.settings.SetupWizardUtils;
 import com.android.settings.accessibility.AccessibilitySetupWizardUtils;
+import com.android.settings.accessibility.Flags;
 import com.android.settings.accessibility.PreferredShortcuts;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.dashboard.DashboardFragment;
@@ -201,9 +202,14 @@
         super.onCreatePreferences(savedInstanceState, rootKey);
 
         Activity activity = getActivity();
+        final Preference descriptionPref = findPreference(getString(
+                R.string.accessibility_shortcut_description_pref));
 
         if (!activity.getIntent().getAction().equals(
                 Settings.ACTION_ACCESSIBILITY_SHORTCUT_SETTINGS)) {
+            if (Flags.toggleFeatureFragmentCollectionInfo()) {
+                descriptionPref.setVisible(false);
+            }
             return;
         }
 
@@ -219,10 +225,11 @@
         );
 
         activity.setTitle(titles.first);
-
-        String screenDescriptionPrefKey = getString(
-                R.string.accessibility_shortcut_description_pref);
-        findPreference(screenDescriptionPrefKey).setSummary(titles.second);
+        if (titles.second != null || !Flags.toggleFeatureFragmentCollectionInfo()) {
+            descriptionPref.setSummary(titles.second);
+        } else {
+            descriptionPref.setVisible(false);
+        }
     }
 
     @NonNull
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
index b32ab4f..03010bb 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
@@ -207,10 +207,9 @@
     @VisibleForTesting
     protected boolean shouldShowLottie() {
         DisplayDensityUtils displayDensity = new DisplayDensityUtils(getApplicationContext());
-        int currentDensityIndex = displayDensity.getCurrentIndexForDefaultDisplay();
-        final int currentDensity = displayDensity.getDefaultDisplayDensityValues()
-                [currentDensityIndex];
-        final int defaultDensity = displayDensity.getDefaultDensityForDefaultDisplay();
+        int currentDensityIndex = displayDensity.getCurrentIndex();
+        final int currentDensity = displayDensity.getValues()[currentDensityIndex];
+        final int defaultDensity = displayDensity.getDefaultDensity();
 
         if (getResources().getConfiguration().fontScale > 1) {
             return false;
diff --git a/src/com/android/settings/biometrics/fingerprint2/BiometricsEnvironment.kt b/src/com/android/settings/biometrics/fingerprint2/BiometricsEnvironment.kt
index 761a9c3..50ac3cd 100644
--- a/src/com/android/settings/biometrics/fingerprint2/BiometricsEnvironment.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/BiometricsEnvironment.kt
@@ -133,11 +133,8 @@
   fun createRenameFingerprintInteractor(): RenameFingerprintInteractor =
     RenameFingerprintsInteractorImpl(fingerprintManager, context.userId, backgroundDispatcher)
 
-  val accessibilityInteractor: AccessibilityInteractor by lazy {
-    AccessibilityInteractorImpl(
-      context.getSystemService(AccessibilityManager::class.java)!!,
-      applicationScope,
-    )
+  fun createAccessibilityInteractor(): AccessibilityInteractor {
+    return AccessibilityInteractorImpl(context.getSystemService(AccessibilityManager::class.java)!!)
   }
 
   val foldStateInteractor: FoldStateInteractor by lazy { FoldStateInteractorImpl(context) }
@@ -157,7 +154,7 @@
   val enrollStageInteractor: EnrollStageInteractor by lazy { EnrollStageInteractorImpl() }
 
   val udfpsEnrollInteractor: UdfpsEnrollInteractor by lazy {
-    UdfpsEnrollInteractorImpl(context, accessibilityInteractor)
+    UdfpsEnrollInteractorImpl(context, createAccessibilityInteractor())
   }
 
   val sensorInteractor: FingerprintSensorInteractor by lazy {
diff --git a/src/com/android/settings/biometrics/fingerprint2/conversion/Util.kt b/src/com/android/settings/biometrics/fingerprint2/conversion/Util.kt
index 0ef1d25..27465c2 100644
--- a/src/com/android/settings/biometrics/fingerprint2/conversion/Util.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/conversion/Util.kt
@@ -67,6 +67,7 @@
     return FingerEnrollState.EnrollError(
       errTitle,
       errString,
+      this,
       this == FINGERPRINT_ERROR_UNABLE_TO_PROCESS,
       this == FINGERPRINT_ERROR_CANCELED,
     )
diff --git a/src/com/android/settings/biometrics/fingerprint2/domain/interactor/AccessibilityInteractor.kt b/src/com/android/settings/biometrics/fingerprint2/domain/interactor/AccessibilityInteractor.kt
index e1a08e6..9f62ed0 100644
--- a/src/com/android/settings/biometrics/fingerprint2/domain/interactor/AccessibilityInteractor.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/domain/interactor/AccessibilityInteractor.kt
@@ -16,6 +16,8 @@
 
 package com.android.settings.biometrics.fingerprint2.domain.interactor
 
+import android.view.accessibility.AccessibilityEvent
+import android.view.accessibility.AccessibilityEvent.TYPE_ANNOUNCEMENT
 import android.view.accessibility.AccessibilityManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.channels.awaitClose
@@ -27,26 +29,38 @@
 /** Represents all of the information on accessibility state. */
 interface AccessibilityInteractor {
   /** A flow that contains whether or not accessibility is enabled */
-  val isAccessibilityEnabled: Flow<Boolean>
+  fun isEnabledFlow(scope: CoroutineScope): Flow<Boolean>
+  val isEnabled: Boolean
+  fun announce(clazz: Class<*>, announcement: CharSequence?)
 }
 
 class AccessibilityInteractorImpl(
-  accessibilityManager: AccessibilityManager,
-  applicationScope: CoroutineScope,
+  private val accessibilityManager: AccessibilityManager,
 ) : AccessibilityInteractor {
   /** A flow that contains whether or not accessibility is enabled */
-  override val isAccessibilityEnabled: Flow<Boolean> =
+  override fun isEnabledFlow(scope: CoroutineScope): Flow<Boolean> =
     callbackFlow {
-        val listener =
-          AccessibilityManager.AccessibilityStateChangeListener { enabled -> trySend(enabled) }
-        accessibilityManager.addAccessibilityStateChangeListener(listener)
+      val listener =
+        AccessibilityManager.AccessibilityStateChangeListener { enabled -> trySend(enabled) }
+      accessibilityManager.addAccessibilityStateChangeListener(listener)
 
-        // This clause will be called when no one is listening to the flow
-        awaitClose { accessibilityManager.removeAccessibilityStateChangeListener(listener) }
-      }
+      // This clause will be called when no one is listening to the flow
+      awaitClose { accessibilityManager.removeAccessibilityStateChangeListener(listener) }
+    }
       .stateIn(
-        applicationScope, // This is going to tied to the activity scope
+        scope,
         SharingStarted.WhileSubscribed(), // When no longer subscribed, we removeTheListener
         false,
       )
+
+  override val isEnabled: Boolean
+    get() = accessibilityManager.isEnabled
+
+  override fun announce(clazz: Class<*>, announcement: CharSequence?) {
+    val event = AccessibilityEvent(TYPE_ANNOUNCEMENT)
+    event.className = clazz.javaClass.name
+    event.packageName = clazz.packageName
+    event.text.add(announcement)
+    accessibilityManager.sendAccessibilityEvent(event)
+  }
 }
diff --git a/src/com/android/settings/biometrics/fingerprint2/domain/interactor/DisplayDensityInteractor.kt b/src/com/android/settings/biometrics/fingerprint2/domain/interactor/DisplayDensityInteractor.kt
index 6dfb4c2..00e85b1 100644
--- a/src/com/android/settings/biometrics/fingerprint2/domain/interactor/DisplayDensityInteractor.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/domain/interactor/DisplayDensityInteractor.kt
@@ -42,7 +42,7 @@
   val fontScale: Flow<Float>
 
   /** A flow that propagates displayDensity. */
-  val displayDensity: Flow<Int>
+  val displayDensity: Flow<Int?>
 
   /** A flow that propagates the default display density. */
   val defaultDisplayDensity: Flow<Int>
@@ -67,16 +67,14 @@
 
   private val _fontScale = MutableStateFlow(context.resources.configuration.fontScale)
   private val _displayDensity =
-    MutableStateFlow(
-      displayDensityUtils.defaultDisplayDensityValues[
-          displayDensityUtils.currentIndexForDefaultDisplay]
-    )
+    MutableStateFlow(displayDensityUtils.values?.let{
+      it[displayDensityUtils.currentIndex]
+    })
 
   override val fontScale: Flow<Float> = _fontScale.asStateFlow()
 
-  override val displayDensity: Flow<Int> = _displayDensity.asStateFlow()
+  override val displayDensity: Flow<Int?> = _displayDensity.asStateFlow()
 
   override val defaultDisplayDensity: Flow<Int> =
-    flowOf(displayDensityUtils.defaultDensityForDefaultDisplay)
-      .shareIn(scope, SharingStarted.Eagerly, 1)
+    flowOf(displayDensityUtils.defaultDensity).shareIn(scope, SharingStarted.Eagerly, 1)
 }
diff --git a/src/com/android/settings/biometrics/fingerprint2/domain/interactor/UdfpsEnrollInteractor.kt b/src/com/android/settings/biometrics/fingerprint2/domain/interactor/UdfpsEnrollInteractor.kt
index 006060a..62c51ae 100644
--- a/src/com/android/settings/biometrics/fingerprint2/domain/interactor/UdfpsEnrollInteractor.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/domain/interactor/UdfpsEnrollInteractor.kt
@@ -19,6 +19,7 @@
 import android.content.Context
 import android.graphics.PointF
 import android.util.TypedValue
+import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.combine
@@ -87,7 +88,7 @@
   override val guidedEnrollmentOffset: Flow<PointF> =
     combine(
       _guidedEnrollment,
-      accessibilityInteractor.isAccessibilityEnabled,
+      accessibilityInteractor.isEnabledFlow(MainScope()),
       isGuidedEnrollment,
     ) { point, accessibilityEnabled, guidedEnrollmentEnabled ->
       if (accessibilityEnabled || !guidedEnrollmentEnabled) {
diff --git a/src/com/android/settings/biometrics/fingerprint2/lib/model/FingerEnrollState.kt b/src/com/android/settings/biometrics/fingerprint2/lib/model/FingerEnrollState.kt
index e087304..1d368c0 100644
--- a/src/com/android/settings/biometrics/fingerprint2/lib/model/FingerEnrollState.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/lib/model/FingerEnrollState.kt
@@ -35,10 +35,13 @@
   data class EnrollHelp(@StringRes val helpMsgId: Int, val helpString: String) :
     FingerEnrollState()
 
-  /** Represents that an unrecoverable error has been encountered and the operation is complete. */
+  /** Represents that an unrecoverable error has been encountered and the operation is complete.
+   * Note that errorId is the raw error id from [FingerprintManager]
+   */
   data class EnrollError(
     @StringRes val errTitle: Int,
     @StringRes val errString: Int,
+    val errorId: Int,
     val shouldRetryEnrollment: Boolean,
     val isCancelled: Boolean,
   ) : FingerEnrollState()
diff --git a/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/activity/FingerprintEnrollmentV2Activity.kt b/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/activity/FingerprintEnrollmentV2Activity.kt
index 77d070e..dc89c93 100644
--- a/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/activity/FingerprintEnrollmentV2Activity.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/activity/FingerprintEnrollmentV2Activity.kt
@@ -149,11 +149,11 @@
     super.onConfigurationChanged(newConfig)
     foldStateInteractor.onConfigurationChange(newConfig)
     val displayDensityUtils = DisplayDensityUtils(applicationContext)
-    val currIndex = displayDensityUtils.currentIndexForDefaultDisplay
+    val currIndex = displayDensityUtils.currentIndex
     displayDensityInteractor.updateFontScale(resources.configuration.fontScale)
-    displayDensityInteractor.updateDisplayDensity(
-      displayDensityUtils.defaultDisplayDensityValues[currIndex]
-    )
+    displayDensityUtils.values?.let {
+      displayDensityInteractor.updateDisplayDensity(it[currIndex])
+    }
   }
 
   private fun onConfirmDevice(resultCode: Int, data: Intent?) {
diff --git a/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/modules/enrolling/udfps/ui/viewmodel/UdfpsViewModel.kt b/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/modules/enrolling/udfps/ui/viewmodel/UdfpsViewModel.kt
index 658c6c7..df46aa4 100644
--- a/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/modules/enrolling/udfps/ui/viewmodel/UdfpsViewModel.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/modules/enrolling/udfps/ui/viewmodel/UdfpsViewModel.kt
@@ -179,7 +179,7 @@
 
   /** Indicates if accessibility is enabled */
   val accessibilityEnabled =
-    accessibilityInteractor.isAccessibilityEnabled.shareIn(
+    accessibilityInteractor.isEnabledFlow(viewModelScope).shareIn(
       this.viewModelScope,
       SharingStarted.Eagerly,
       replay = 1,
@@ -425,7 +425,7 @@
           biometricEnvironment.enrollStageInteractor,
           biometricEnvironment.orientationInteractor,
           biometricEnvironment.udfpsEnrollInteractor,
-          biometricEnvironment.accessibilityInteractor,
+          biometricEnvironment.createAccessibilityInteractor(),
           biometricEnvironment.sensorInteractor,
           biometricEnvironment.touchEventInteractor,
           biometricEnvironment.createSensorPropertiesInteractor(),
diff --git a/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/viewmodel/FingerprintEnrollFindSensorViewModel.kt b/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/viewmodel/FingerprintEnrollFindSensorViewModel.kt
index 9b2cdde..b27cfdd 100644
--- a/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/viewmodel/FingerprintEnrollFindSensorViewModel.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/viewmodel/FingerprintEnrollFindSensorViewModel.kt
@@ -84,7 +84,7 @@
 
   /** Represents the stream of showing udfps lottie and whether accessibility is enabled. */
   val udfpsLottieInfo: Flow<Boolean> =
-    _showUdfpsLottie.combine(accessibilityInteractor.isAccessibilityEnabled) {
+    _showUdfpsLottie.combine(accessibilityInteractor.isEnabledFlow(viewModelScope)) {
       _,
       isAccessibilityEnabled ->
       isAccessibilityEnabled
@@ -213,7 +213,7 @@
           provider[FingerprintGatekeeperViewModel::class],
           provider[BackgroundViewModel::class],
           provider[FingerprintFlowViewModel::class],
-          biometricEnvironment.accessibilityInteractor,
+          biometricEnvironment.createAccessibilityInteractor(),
           biometricEnvironment.foldStateInteractor,
           biometricEnvironment.orientationInteractor,
           biometricEnvironment.createSensorPropertiesInteractor(),
diff --git a/src/com/android/settings/bluetooth/ui/viewmodel/BluetoothDeviceDetailsViewModel.kt b/src/com/android/settings/bluetooth/ui/viewmodel/BluetoothDeviceDetailsViewModel.kt
index dd0012e..3b7a582 100644
--- a/src/com/android/settings/bluetooth/ui/viewmodel/BluetoothDeviceDetailsViewModel.kt
+++ b/src/com/android/settings/bluetooth/ui/viewmodel/BluetoothDeviceDetailsViewModel.kt
@@ -58,6 +58,8 @@
             deviceSettingRepository.getDeviceSettingsConfig(cachedDevice)
         }
 
+    private val spatialAudioModel by lazy { spatialAudioInteractor.getDeviceSetting(cachedDevice) }
+
     suspend fun getItems(fragment: FragmentTypeModel): List<DeviceSettingConfigItemModel>? =
         when (fragment) {
             is FragmentTypeModel.DeviceDetailsMainFragment -> items.await()?.mainItems
@@ -81,7 +83,7 @@
         }
         return when (settingId) {
             DeviceSettingId.DEVICE_SETTING_ID_SPATIAL_AUDIO_MULTI_TOGGLE ->
-                spatialAudioInteractor.getDeviceSetting(cachedDevice)
+                spatialAudioModel
             else -> deviceSettingRepository.getDeviceSetting(cachedDevice, settingId)
         }.map { it?.toPreferenceModel() }
     }
diff --git a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
index 66f2f1b..90ef5b9 100644
--- a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
@@ -21,6 +21,8 @@
 import android.text.TextUtils;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
 import com.android.settings.R;
@@ -120,4 +122,9 @@
      */
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider(R.xml.bluetooth_screen);
+
+    @Override
+    public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
+        return BluetoothDashboardScreen.KEY;
+    }
 }
diff --git a/src/com/android/settings/connecteddevice/BluetoothDashboardScreen.kt b/src/com/android/settings/connecteddevice/BluetoothDashboardScreen.kt
new file mode 100644
index 0000000..66fd8b1
--- /dev/null
+++ b/src/com/android/settings/connecteddevice/BluetoothDashboardScreen.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2024 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.connecteddevice
+
+import android.content.Context
+import com.android.settings.R
+import com.android.settings.flags.Flags
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenCreator
+
+@ProvidePreferenceScreen
+class BluetoothDashboardScreen : PreferenceScreenCreator {
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.bluetooth_settings_title
+
+    override val icon: Int
+        get() = R.drawable.ic_settings_bluetooth
+
+    override fun isFlagEnabled(context: Context) = Flags.catalystBluetoothSwitchbarScreen()
+
+    override fun hasCompleteHierarchy() = false
+
+    override fun fragmentClass() = BluetoothDashboardFragment::class.java
+
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {}
+
+    companion object {
+        const val KEY = "bluetooth_switchbar_screen"
+    }
+}
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 3e92d5f..117364f 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -60,6 +60,7 @@
 import com.android.settings.applications.appinfo.WriteSettingsDetails;
 import com.android.settings.applications.appops.BackgroundCheckSummary;
 import com.android.settings.applications.assist.ManageAssist;
+import com.android.settings.applications.contacts.ContactsStorageSettings;
 import com.android.settings.applications.manageapplications.ManageApplications;
 import com.android.settings.applications.managedomainurls.ManageDomainUrls;
 import com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminSettings;
@@ -401,7 +402,8 @@
             AccessibilityHearingAidsFragment.class.getName(),
             HearingDevicePairingFragment.class.getName(),
             ZenModesListFragment.class.getName(),
-            ZenModeFragment.class.getName()
+            ZenModeFragment.class.getName(),
+            ContactsStorageSettings.class.getName()
     };
 
     public static final String[] SETTINGS_FOR_RESTRICTED = {
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index 09b7503..8a970fb 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -712,6 +712,7 @@
         controllers.add(new WirelessDebuggingPreferenceController(context, lifecycle));
         controllers.add(new AdbAuthorizationTimeoutPreferenceController(context));
         controllers.add(new LocalTerminalPreferenceController(context));
+        controllers.add(new LinuxTerminalPreferenceController(context));
         controllers.add(new BugReportInPowerPreferenceController(context));
         controllers.add(new AutomaticSystemServerHeapDumpPreferenceController(context));
         controllers.add(new MockLocationAppPreferenceController(context, fragment));
diff --git a/src/com/android/settings/development/LinuxTerminalPreferenceController.java b/src/com/android/settings/development/LinuxTerminalPreferenceController.java
new file mode 100644
index 0000000..3e419e4
--- /dev/null
+++ b/src/com/android/settings/development/LinuxTerminalPreferenceController.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2024 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.development;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.TwoStatePreference;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class LinuxTerminalPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+    private static final String TAG = "LinuxTerminalPrefCtrl";
+
+    private static final String ENABLE_TERMINAL_KEY = "enable_linux_terminal";
+
+    @NonNull
+    private final PackageManager mPackageManager;
+
+    @Nullable
+    private final String mTerminalPackageName;
+
+    public LinuxTerminalPreferenceController(@NonNull Context context) {
+        super(context);
+        mPackageManager = mContext.getPackageManager();
+
+        String packageName = mContext.getString(R.string.config_linux_terminal_app_package_name);
+        mTerminalPackageName =
+                isPackageInstalled(mPackageManager, packageName) ? packageName : null;
+
+        Log.d(TAG, "Terminal app package name=" + packageName + ", isAvailable=" + isAvailable());
+    }
+
+    // Avoid lazy initialization because this may be called before displayPreference().
+    @Override
+    public boolean isAvailable() {
+        // Returns true only if the terminal app is installed which only happens when the build flag
+        // RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES is true.
+        // TODO(b/343795511): Add explicitly check for the flag when it's accessible from Java code.
+        return getTerminalPackageName() != null;
+    }
+
+    @Override
+    @NonNull
+    public String getPreferenceKey() {
+        return ENABLE_TERMINAL_KEY;
+    }
+
+    @Override
+    public void displayPreference(@NonNull PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference.setEnabled(isAvailable());
+    }
+
+    @Override
+    public boolean onPreferenceChange(
+                @NonNull Preference preference, @NonNull Object newValue) {
+        String packageName = getTerminalPackageName();
+        if (packageName == null) {
+            return false;
+        }
+
+        boolean terminalEnabled = (Boolean) newValue;
+        int state = terminalEnabled
+                ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
+                : PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;
+        mPackageManager.setApplicationEnabledSetting(packageName, state, /* flags=*/ 0);
+        ((TwoStatePreference) mPreference).setChecked(terminalEnabled);
+        return true;
+    }
+
+    @Override
+    public void updateState(@NonNull Preference preference) {
+        String packageName = getTerminalPackageName();
+        if (packageName == null) {
+            return;
+        }
+
+        boolean isTerminalEnabled = mPackageManager.getApplicationEnabledSetting(packageName)
+                == PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
+        ((TwoStatePreference) mPreference).setChecked(isTerminalEnabled);
+    }
+
+    // Can be mocked for testing
+    @VisibleForTesting
+    @Nullable
+    String getTerminalPackageName() {
+        return mTerminalPackageName;
+    }
+
+    private static boolean isPackageInstalled(PackageManager manager, String packageName) {
+        if (TextUtils.isEmpty(packageName)) {
+            return false;
+        }
+        try {
+            return manager.getPackageInfo(
+                    packageName,
+                    PackageManager.MATCH_ALL | PackageManager.MATCH_DISABLED_COMPONENTS) != null;
+        } catch (PackageManager.NameNotFoundException e) {
+            return false;
+        }
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFeatureProvider.kt b/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFeatureProvider.kt
index e9866d7..4b2666f 100644
--- a/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFeatureProvider.kt
+++ b/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFeatureProvider.kt
@@ -27,5 +27,5 @@
     /**
      * The country of origin label.
      */
-    val countryIfOriginLabel: String
+    val countryOfOriginLabel: String
 }
diff --git a/src/com/android/settings/display/DisplayScreen.kt b/src/com/android/settings/display/DisplayScreen.kt
index 9886e4a..7b1d000 100644
--- a/src/com/android/settings/display/DisplayScreen.kt
+++ b/src/com/android/settings/display/DisplayScreen.kt
@@ -20,18 +20,26 @@
 import com.android.settings.R
 import com.android.settings.flags.Flags
 import com.android.settingslib.metadata.PreferenceAvailabilityProvider
+import com.android.settingslib.metadata.PreferenceIconProvider
 import com.android.settingslib.metadata.ProvidePreferenceScreen
 import com.android.settingslib.metadata.preferenceHierarchy
 import com.android.settingslib.preference.PreferenceScreenCreator
 
 @ProvidePreferenceScreen
-class DisplayScreen : PreferenceScreenCreator, PreferenceAvailabilityProvider {
+class DisplayScreen :
+    PreferenceScreenCreator, PreferenceAvailabilityProvider, PreferenceIconProvider {
     override val key: String
         get() = KEY
 
     override val title: Int
         get() = R.string.display_settings
 
+    override fun getIcon(context: Context) =
+        when {
+            Flags.homepageRevamp() -> R.drawable.ic_settings_display_filled
+            else -> R.drawable.ic_settings_display_white
+        }
+
     override fun isFlagEnabled(context: Context) = Flags.catalystDisplaySettingsScreen()
 
     override fun hasCompleteHierarchy() = false
diff --git a/src/com/android/settings/display/ScreenResolutionFragment.java b/src/com/android/settings/display/ScreenResolutionFragment.java
index a2ad25f..d9718f6 100644
--- a/src/com/android/settings/display/ScreenResolutionFragment.java
+++ b/src/com/android/settings/display/ScreenResolutionFragment.java
@@ -325,11 +325,10 @@
             }
 
             final DisplayDensityUtils density = new DisplayDensityUtils(mContext);
-            final int currentIndex = density.getCurrentIndexForDefaultDisplay();
-            final int defaultDensity = density.getDefaultDensityForDefaultDisplay();
+            final int currentIndex = density.getCurrentIndex();
+            final int defaultDensity = density.getDefaultDensity();
 
-            if (density.getDefaultDisplayDensityValues()[mCurrentIndex]
-                    == density.getDefaultDensityForDefaultDisplay()) {
+            if (density.getValues()[mCurrentIndex] == density.getDefaultDensity()) {
                 return;
             }
 
@@ -373,20 +372,19 @@
             /* If current density is the same as a default density of other resolutions,
              * then mCurrentIndex may be out of boundary.
              */
-            if (density.getDefaultDisplayDensityValues().length <= mCurrentIndex) {
-                mCurrentIndex = density.getCurrentIndexForDefaultDisplay();
+            if (density.getValues().length <= mCurrentIndex) {
+                mCurrentIndex = density.getCurrentIndex();
             }
-            if (density.getDefaultDisplayDensityValues()[mCurrentIndex]
-                    != density.getDefaultDensityForDefaultDisplay()) {
+            if (density.getValues()[mCurrentIndex] != density.getDefaultDensity()) {
                 density.setForcedDisplayDensity(mCurrentIndex);
             }
 
-            mDefaultDensity = density.getDefaultDensityForDefaultDisplay();
+            mDefaultDensity = density.getDefaultDensity();
         }
 
         private boolean isDensityChanged() {
             final DisplayDensityUtils density = new DisplayDensityUtils(mContext);
-            if (density.getDefaultDensityForDefaultDisplay() == mDefaultDensity) {
+            if (density.getDefaultDensity() == mDefaultDensity) {
                 return false;
             }
 
diff --git a/src/com/android/settings/display/ScreenZoomPreference.java b/src/com/android/settings/display/ScreenZoomPreference.java
index af77a0e..f47d7da 100644
--- a/src/com/android/settings/display/ScreenZoomPreference.java
+++ b/src/com/android/settings/display/ScreenZoomPreference.java
@@ -36,13 +36,13 @@
                 android.R.attr.preferenceStyle));
 
         final DisplayDensityUtils density = new DisplayDensityUtils(context);
-        final int defaultIndex = density.getCurrentIndexForDefaultDisplay();
+        final int defaultIndex = density.getCurrentIndex();
         if (defaultIndex < 0) {
             setVisible(false);
             setEnabled(false);
         } else if (TextUtils.isEmpty(getSummary())) {
-            final String[] entries = density.getDefaultDisplayDensityEntries();
-            final int currentIndex = density.getCurrentIndexForDefaultDisplay();
+            final String[] entries = density.getEntries();
+            final int currentIndex = density.getCurrentIndex();
             setSummary(entries[currentIndex]);
         }
     }
diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
index e922f70..28d7d58 100644
--- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
@@ -26,13 +26,10 @@
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.UserHandle;
-import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
@@ -48,7 +45,6 @@
 import com.android.settings.fuelgauge.batteryusage.BatteryEntry;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.widget.EntityHeaderController;
-import com.android.settingslib.PrimarySwitchPreference;
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.core.AbstractPreferenceController;
@@ -67,9 +63,7 @@
  * 2. Battery related controls for app(i.e uninstall, force stop)
  */
 public class AdvancedPowerUsageDetail extends DashboardFragment
-        implements ButtonActionDialogFragment.AppButtonsDialogListener,
-                Preference.OnPreferenceClickListener,
-                Preference.OnPreferenceChangeListener {
+        implements ButtonActionDialogFragment.AppButtonsDialogListener {
     public static final String TAG = "AdvancedPowerDetail";
     public static final String EXTRA_UID = "extra_uid";
     public static final String EXTRA_PACKAGE_NAME = "extra_package_name";
@@ -86,7 +80,8 @@
     public static final String EXTRA_POWER_USAGE_AMOUNT = "extra_power_usage_amount";
 
     private static final String KEY_PREF_HEADER = "header_view";
-    private static final String KEY_ALLOW_BACKGROUND_USAGE = "allow_background_usage";
+    private static final String KEY_BACKGROUND_USAGE_ALLOWABILITY_CATEGORY =
+            "background_usage_allowability_category";
 
     private static final int REQUEST_UNINSTALL = 0;
     private static final int REQUEST_REMOVE_DEVICE_ADMIN = 1;
@@ -96,11 +91,9 @@
     private AppButtonsPreferenceController mAppButtonsPreferenceController;
     private PowerUsageTimeController mPowerUsageTimeController;
 
-    @VisibleForTesting LayoutPreference mHeaderPreference;
     @VisibleForTesting ApplicationsState mState;
     @VisibleForTesting ApplicationsState.AppEntry mAppEntry;
     @VisibleForTesting BatteryOptimizeUtils mBatteryOptimizeUtils;
-    @VisibleForTesting PrimarySwitchPreference mAllowBackgroundUsagePreference;
 
     @VisibleForTesting @BatteryOptimizeUtils.OptimizationMode
     int mOptimizationMode = BatteryOptimizeUtils.MODE_UNKNOWN;
@@ -242,17 +235,11 @@
     public void onAttach(Activity activity) {
         super.onAttach(activity);
 
+        final Bundle bundle = getArguments();
+        final int uid = bundle.getInt(EXTRA_UID, 0);
+        final String packageName = bundle.getString(EXTRA_PACKAGE_NAME);
+        mBatteryOptimizeUtils = new BatteryOptimizeUtils(getContext(), uid, packageName);
         mState = ApplicationsState.getInstance(getActivity().getApplication());
-    }
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        final String packageName = getArguments().getString(EXTRA_PACKAGE_NAME);
-        onCreateBackgroundUsageState(packageName);
-        mHeaderPreference = findPreference(KEY_PREF_HEADER);
-
         if (packageName != null) {
             mAppEntry = mState.getEntry(packageName, UserHandle.myUserId());
         }
@@ -264,7 +251,6 @@
 
         initHeader();
         mOptimizationMode = mBatteryOptimizeUtils.getAppOptimizationMode();
-        initFooter();
         mLogStringBuilder = new StringBuilder("onResume mode = ").append(mOptimizationMode);
     }
 
@@ -299,7 +285,8 @@
 
     @VisibleForTesting
     void initHeader() {
-        final View appSnippet = mHeaderPreference.findViewById(R.id.entity_header);
+        final LayoutPreference headerPreference = findPreference(KEY_PREF_HEADER);
+        final View appSnippet = headerPreference.findViewById(R.id.entity_header);
         final Activity context = getActivity();
         final Bundle bundle = getArguments();
         EntityHeaderController controller =
@@ -340,31 +327,6 @@
         controller.done(true /* rebindActions */);
     }
 
-    @VisibleForTesting
-    void initFooter() {
-        final String stateString;
-        final String detailInfoString;
-        final Context context = getContext();
-
-        if (mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()) {
-            // Present optimized only string when the package name is invalid.
-            stateString = context.getString(R.string.manager_battery_usage_optimized_only);
-            detailInfoString =
-                    context.getString(R.string.manager_battery_usage_footer_limited, stateString);
-        } else if (mBatteryOptimizeUtils.isSystemOrDefaultApp()) {
-            // Present unrestricted only string when the package is system or default active app.
-            stateString = context.getString(R.string.manager_battery_usage_unrestricted_only);
-            detailInfoString =
-                    context.getString(R.string.manager_battery_usage_footer_limited, stateString);
-        } else {
-            // Present default string to normal app.
-            detailInfoString =
-                    context.getString(
-                            R.string.manager_battery_usage_allow_background_usage_summary);
-        }
-        mAllowBackgroundUsagePreference.setSummary(detailInfoString);
-    }
-
     @Override
     public int getMetricsCategory() {
         return SettingsEnums.FUELGAUGE_POWER_USAGE_DETAIL;
@@ -384,7 +346,6 @@
     protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
         final List<AbstractPreferenceController> controllers = new ArrayList<>();
         final Bundle bundle = getArguments();
-        final int uid = bundle.getInt(EXTRA_UID, 0);
         final String packageName = bundle.getString(EXTRA_PACKAGE_NAME);
 
         mAppButtonsPreferenceController =
@@ -401,7 +362,12 @@
             controllers.add(mPowerUsageTimeController);
         }
         controllers.add(mAppButtonsPreferenceController);
-        controllers.add(new AllowBackgroundPreferenceController(context, uid, packageName));
+        controllers.add(
+                new BackgroundUsageAllowabilityPreferenceController(
+                        context,
+                        /* dashboardFragment= */ this,
+                        KEY_BACKGROUND_USAGE_ALLOWABILITY_CATEGORY,
+                        mBatteryOptimizeUtils));
 
         return controllers;
     }
@@ -421,34 +387,6 @@
         }
     }
 
-    @Override
-    public boolean onPreferenceClick(Preference preference) {
-        if (!(preference instanceof PrimarySwitchPreference)
-                || !TextUtils.equals(preference.getKey(), KEY_ALLOW_BACKGROUND_USAGE)) {
-            return false;
-        }
-        PowerBackgroundUsageDetail.startPowerBackgroundUsageDetailPage(
-                getContext(), getArguments());
-        return true;
-    }
-
-    @Override
-    public boolean onPreferenceChange(@NonNull Preference preference, Object newValue) {
-        if (!(preference instanceof PrimarySwitchPreference)
-                || !TextUtils.equals(preference.getKey(), KEY_ALLOW_BACKGROUND_USAGE)) {
-            return false;
-        }
-        if (newValue instanceof Boolean) {
-            final boolean isAllowBackgroundUsage = (boolean) newValue;
-            mBatteryOptimizeUtils.setAppUsageState(
-                    isAllowBackgroundUsage
-                            ? BatteryOptimizeUtils.MODE_OPTIMIZED
-                            : BatteryOptimizeUtils.MODE_RESTRICTED,
-                    Action.APPLY);
-        }
-        return true;
-    }
-
     private void logMetricCategory(int currentOptimizeMode) {
         if (currentOptimizeMode == mOptimizationMode) {
             return;
@@ -482,16 +420,4 @@
                                     getArguments().getInt(EXTRA_POWER_USAGE_AMOUNT));
                 });
     }
-
-    private void onCreateBackgroundUsageState(String packageName) {
-        mAllowBackgroundUsagePreference = findPreference(KEY_ALLOW_BACKGROUND_USAGE);
-        if (mAllowBackgroundUsagePreference != null) {
-            mAllowBackgroundUsagePreference.setOnPreferenceClickListener(this);
-            mAllowBackgroundUsagePreference.setOnPreferenceChangeListener(this);
-        }
-
-        mBatteryOptimizeUtils =
-                new BatteryOptimizeUtils(
-                        getContext(), getArguments().getInt(EXTRA_UID), packageName);
-    }
 }
diff --git a/src/com/android/settings/fuelgauge/AllowBackgroundPreferenceController.java b/src/com/android/settings/fuelgauge/AllowBackgroundPreferenceController.java
deleted file mode 100644
index 52cec795..0000000
--- a/src/com/android/settings/fuelgauge/AllowBackgroundPreferenceController.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2023 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;
-
-import android.content.Context;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.PrimarySwitchPreference;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.widget.MainSwitchPreference;
-
-/** Controller to update the app background usage state */
-public class AllowBackgroundPreferenceController extends AbstractPreferenceController
-        implements PreferenceControllerMixin {
-
-    private static final String TAG = "AllowBackgroundPreferenceController";
-
-    @VisibleForTesting static final String KEY_ALLOW_BACKGROUND_USAGE = "allow_background_usage";
-
-    @VisibleForTesting BatteryOptimizeUtils mBatteryOptimizeUtils;
-
-    public AllowBackgroundPreferenceController(Context context, int uid, String packageName) {
-        super(context);
-        mBatteryOptimizeUtils = new BatteryOptimizeUtils(context, uid, packageName);
-    }
-
-    private void setChecked(Preference preference, boolean checked) {
-        if (preference instanceof PrimarySwitchPreference) {
-            ((PrimarySwitchPreference) preference).setChecked(checked);
-        } else if (preference instanceof MainSwitchPreference) {
-            ((MainSwitchPreference) preference).setChecked(checked);
-        }
-    }
-
-    private void setEnabled(Preference preference, boolean enabled) {
-        if (preference instanceof PrimarySwitchPreference) {
-            ((PrimarySwitchPreference) preference).setEnabled(enabled);
-            ((PrimarySwitchPreference) preference).setSwitchEnabled(enabled);
-        } else if (preference instanceof MainSwitchPreference) {
-            ((MainSwitchPreference) preference).setEnabled(enabled);
-        }
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        setEnabled(preference, mBatteryOptimizeUtils.isOptimizeModeMutable());
-
-        final boolean isAllowBackground =
-                mBatteryOptimizeUtils.getAppOptimizationMode()
-                        != BatteryOptimizeUtils.MODE_RESTRICTED;
-        setChecked(preference, isAllowBackground);
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return true;
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return KEY_ALLOW_BACKGROUND_USAGE;
-    }
-
-    @Override
-    public boolean handlePreferenceTreeClick(Preference preference) {
-        return getPreferenceKey().equals(preference.getKey());
-    }
-}
diff --git a/src/com/android/settings/fuelgauge/BackgroundUsageAllowabilityPreferenceController.java b/src/com/android/settings/fuelgauge/BackgroundUsageAllowabilityPreferenceController.java
new file mode 100644
index 0000000..bce439b
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/BackgroundUsageAllowabilityPreferenceController.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2024 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;
+
+import android.content.Context;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+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.settingslib.PrimarySwitchPreference;
+
+/** Controller to update the manage battery usage preference in App Battery Usage page */
+public class BackgroundUsageAllowabilityPreferenceController extends BasePreferenceController
+        implements PreferenceControllerMixin {
+
+    @VisibleForTesting
+    static final String KEY_BACKGROUND_USAGE_ALLOWABILITY_SWITCH =
+            "background_usage_allowability_switch";
+
+    private final BatteryOptimizeUtils mBatteryOptimizeUtils;
+    private final DashboardFragment mDashboardFragment;
+    @Nullable @VisibleForTesting PrimarySwitchPreference mBackgroundUsageAllowabilityPreference;
+
+    public BackgroundUsageAllowabilityPreferenceController(
+            @NonNull Context context,
+            @NonNull DashboardFragment dashboardFragment,
+            @NonNull String preferenceKey,
+            @NonNull BatteryOptimizeUtils batteryOptimizeUtils) {
+        super(context, preferenceKey);
+        mDashboardFragment = dashboardFragment;
+        mBatteryOptimizeUtils = batteryOptimizeUtils;
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public void updateState(@NonNull Preference preference) {
+        updatePreferences(mBatteryOptimizeUtils.getAppOptimizationMode());
+    }
+
+    @Override
+    public void displayPreference(@NonNull PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mBackgroundUsageAllowabilityPreference =
+                screen.findPreference(KEY_BACKGROUND_USAGE_ALLOWABILITY_SWITCH);
+        initPreferences();
+    }
+
+    @VisibleForTesting
+    void initPreferences() {
+        if (mBackgroundUsageAllowabilityPreference == null) {
+            return;
+        }
+        final String stateString;
+        final String detailInfoString;
+        boolean isPreferenceEnabled = true;
+        if (mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()) {
+            // Present "Optimized" only string if the package name is invalid.
+            stateString = mContext.getString(R.string.manager_battery_usage_optimized_only);
+            detailInfoString =
+                    mContext.getString(R.string.manager_battery_usage_footer_limited, stateString);
+            isPreferenceEnabled = false;
+        } else if (mBatteryOptimizeUtils.isSystemOrDefaultApp()) {
+            // Present "Unrestricted" only string if the package is system important apps.
+            stateString = mContext.getString(R.string.manager_battery_usage_unrestricted_only);
+            detailInfoString =
+                    mContext.getString(R.string.manager_battery_usage_footer_limited, stateString);
+            isPreferenceEnabled = false;
+        } else {
+            // Present default string to normal app.
+            detailInfoString =
+                    mContext.getString(
+                            R.string.manager_battery_usage_allow_background_usage_summary);
+        }
+        mBackgroundUsageAllowabilityPreference.setEnabled(isPreferenceEnabled);
+        mBackgroundUsageAllowabilityPreference.setSwitchEnabled(isPreferenceEnabled);
+        mBackgroundUsageAllowabilityPreference.setSummary(detailInfoString);
+        if (isPreferenceEnabled) {
+            mBackgroundUsageAllowabilityPreference.setOnPreferenceClickListener(
+                    preference -> {
+                        PowerBackgroundUsageDetail.startPowerBackgroundUsageDetailPage(
+                                mContext, mDashboardFragment.getArguments());
+                        return true;
+                    });
+            mBackgroundUsageAllowabilityPreference.setOnPreferenceChangeListener(
+                    (preference, isAllowBackground) -> {
+                        handleBatteryOptimizeModeUpdated(
+                                (boolean) isAllowBackground
+                                        ? BatteryOptimizeUtils.MODE_OPTIMIZED
+                                        : BatteryOptimizeUtils.MODE_RESTRICTED);
+                        return true;
+                    });
+        }
+    }
+
+    @VisibleForTesting
+    void handleBatteryOptimizeModeUpdated(int newBatteryOptimizeMode) {
+        if (mBatteryOptimizeUtils.getAppOptimizationMode() == newBatteryOptimizeMode) {
+            Log.w(TAG, "ignore same mode for: " + mBatteryOptimizeUtils.getPackageName());
+            return;
+        }
+        mBatteryOptimizeUtils.setAppUsageState(
+                newBatteryOptimizeMode, BatteryOptimizeHistoricalLogEntry.Action.APPLY);
+        updatePreferences(newBatteryOptimizeMode);
+    }
+
+    @VisibleForTesting
+    void updatePreferences(int optimizationMode) {
+        if (mBackgroundUsageAllowabilityPreference == null) {
+            return;
+        }
+        mBackgroundUsageAllowabilityPreference.setChecked(
+                optimizationMode != BatteryOptimizeUtils.MODE_RESTRICTED);
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/BatteryBackupHelper.java b/src/com/android/settings/fuelgauge/BatteryBackupHelper.java
index 5822397..651a1b2 100644
--- a/src/com/android/settings/fuelgauge/BatteryBackupHelper.java
+++ b/src/com/android/settings/fuelgauge/BatteryBackupHelper.java
@@ -196,7 +196,9 @@
                     appOptModeMap.containsKey(info.uid)
                             ? (int) appOptModeMap.get(info.uid).getResetOptimizationMode()
                             : BatteryOptimizeUtils.getAppOptimizationMode(
-                                    mode, allowlistedApps.contains(info.packageName));
+                                    mode,
+                                    allowlistedApps.contains(info.packageName),
+                                    /* ignoreUnknownMode= */ false);
             // Ignores default optimized/unknown state or system/default apps.
             if (optimizationMode == BatteryOptimizeUtils.MODE_OPTIMIZED
                     || optimizationMode == BatteryOptimizeUtils.MODE_UNKNOWN
diff --git a/src/com/android/settings/fuelgauge/BatteryOptimizationModePreferenceController.java b/src/com/android/settings/fuelgauge/BatteryOptimizationModePreferenceController.java
new file mode 100644
index 0000000..0a4cbac
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/BatteryOptimizationModePreferenceController.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2024 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;
+
+import android.content.Context;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.widget.MainSwitchPreference;
+import com.android.settingslib.widget.SelectorWithWidgetPreference;
+
+/** Controller to update the app background usage mode state in Allow background usage page */
+public class BatteryOptimizationModePreferenceController extends BasePreferenceController
+        implements PreferenceControllerMixin {
+
+    @VisibleForTesting
+    static final String KEY_BACKGROUND_USAGE_ALLOWABILITY_SWITCH =
+            "background_usage_allowability_switch";
+
+    @VisibleForTesting static final String KEY_OPTIMIZED_PREF = "optimized_preference";
+    @VisibleForTesting static final String KEY_UNRESTRICTED_PREF = "unrestricted_preference";
+
+    private final BatteryOptimizeUtils mBatteryOptimizeUtils;
+    @Nullable @VisibleForTesting MainSwitchPreference mBackgroundUsageAllowabilityPreference;
+    @Nullable @VisibleForTesting SelectorWithWidgetPreference mOptimizedPreference;
+    @Nullable @VisibleForTesting SelectorWithWidgetPreference mUnrestrictedPreference;
+
+    public BatteryOptimizationModePreferenceController(
+            @NonNull Context context,
+            @NonNull String preferenceKey,
+            @NonNull BatteryOptimizeUtils batteryOptimizeUtils) {
+        super(context, preferenceKey);
+        mBatteryOptimizeUtils = batteryOptimizeUtils;
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public void updateState(@NonNull Preference preference) {
+        updatePreferences(mBatteryOptimizeUtils.getAppOptimizationMode());
+    }
+
+    @Override
+    public void displayPreference(@NonNull PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mBackgroundUsageAllowabilityPreference =
+                screen.findPreference(KEY_BACKGROUND_USAGE_ALLOWABILITY_SWITCH);
+        mOptimizedPreference = screen.findPreference(KEY_OPTIMIZED_PREF);
+        mUnrestrictedPreference = screen.findPreference(KEY_UNRESTRICTED_PREF);
+        initPreferences();
+    }
+
+    @VisibleForTesting
+    void initPreferences() {
+        if (mBackgroundUsageAllowabilityPreference == null
+                || mOptimizedPreference == null
+                || mUnrestrictedPreference == null) {
+            return;
+        }
+        final boolean isEnabled = mBatteryOptimizeUtils.isOptimizeModeMutable();
+        mBackgroundUsageAllowabilityPreference.setEnabled(isEnabled);
+        mOptimizedPreference.setEnabled(isEnabled);
+        mUnrestrictedPreference.setEnabled(isEnabled);
+        if (isEnabled) {
+            mBackgroundUsageAllowabilityPreference.setOnPreferenceChangeListener(
+                    (preference, isAllowBackground) -> {
+                        handleBatteryOptimizeModeUpdated(
+                                (boolean) isAllowBackground
+                                        ? BatteryOptimizeUtils.MODE_OPTIMIZED
+                                        : BatteryOptimizeUtils.MODE_RESTRICTED);
+                        return true;
+                    });
+            mOptimizedPreference.setOnPreferenceClickListener(
+                    preference -> {
+                        handleBatteryOptimizeModeUpdated(BatteryOptimizeUtils.MODE_OPTIMIZED);
+                        return true;
+                    });
+            mUnrestrictedPreference.setOnPreferenceClickListener(
+                    preference -> {
+                        handleBatteryOptimizeModeUpdated(BatteryOptimizeUtils.MODE_UNRESTRICTED);
+                        return true;
+                    });
+        }
+    }
+
+    @VisibleForTesting
+    void updatePreferences(int optimizationMode) {
+        if (mBackgroundUsageAllowabilityPreference == null
+                || mOptimizedPreference == null
+                || mUnrestrictedPreference == null) {
+            return;
+        }
+        final boolean isAllowBackground = optimizationMode != BatteryOptimizeUtils.MODE_RESTRICTED;
+        mBackgroundUsageAllowabilityPreference.setChecked(isAllowBackground);
+        mOptimizedPreference.setEnabled(isAllowBackground);
+        mUnrestrictedPreference.setEnabled(isAllowBackground);
+        mOptimizedPreference.setChecked(optimizationMode == BatteryOptimizeUtils.MODE_OPTIMIZED);
+        mUnrestrictedPreference.setChecked(
+                optimizationMode == BatteryOptimizeUtils.MODE_UNRESTRICTED);
+    }
+
+    @VisibleForTesting
+    void handleBatteryOptimizeModeUpdated(int newBatteryOptimizeMode) {
+        if (mBatteryOptimizeUtils.getAppOptimizationMode() == newBatteryOptimizeMode) {
+            Log.w(TAG, "ignore same mode for: " + mBatteryOptimizeUtils.getPackageName());
+            return;
+        }
+        mBatteryOptimizeUtils.setAppUsageState(
+                newBatteryOptimizeMode, BatteryOptimizeHistoricalLogEntry.Action.APPLY);
+        updatePreferences(newBatteryOptimizeMode);
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java b/src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java
index 3233f0d..6c95823 100644
--- a/src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java
+++ b/src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java
@@ -100,7 +100,8 @@
 
     /** Gets the {@link OptimizationMode} based on mode and allowed list. */
     @OptimizationMode
-    public static int getAppOptimizationMode(int mode, boolean isAllowListed) {
+    public static int getAppOptimizationMode(
+            int mode, boolean isAllowListed, boolean ignoreUnknownMode) {
         if (!isAllowListed && mode == AppOpsManager.MODE_IGNORED) {
             return MODE_RESTRICTED;
         } else if (isAllowListed && mode == AppOpsManager.MODE_ALLOWED) {
@@ -108,13 +109,15 @@
         } else if (!isAllowListed && mode == AppOpsManager.MODE_ALLOWED) {
             return MODE_OPTIMIZED;
         } else {
-            return MODE_UNKNOWN;
+            // MODE_UNKNOWN = isAllowListed + AppOpsManager.MODE_IGNORED
+            // Return Unrestricted mode for Unknown mode since it is in allowlist.
+            return ignoreUnknownMode ? MODE_UNRESTRICTED : MODE_UNKNOWN;
         }
     }
 
     /** Gets the {@link OptimizationMode} for associated app. */
     @OptimizationMode
-    public int getAppOptimizationMode(boolean refreshList) {
+    public int getAppOptimizationMode(boolean refreshList, boolean ignoreUnknownMode) {
         if (refreshList) {
             mPowerAllowListBackend.refreshList();
         }
@@ -127,13 +130,13 @@
                 String.format(
                         "refresh %s state, allowlisted = %s, mode = %d",
                         mPackageName, mAllowListed, mMode));
-        return getAppOptimizationMode(mMode, mAllowListed);
+        return getAppOptimizationMode(mMode, mAllowListed, ignoreUnknownMode);
     }
 
     /** Gets the {@link OptimizationMode} for associated app. */
     @OptimizationMode
     public int getAppOptimizationMode() {
-        return getAppOptimizationMode(true);
+        return getAppOptimizationMode(/* refreshList= */ true, /* ignoreUnknownMode= */ true);
     }
 
     /** Resets optimization mode for all applications. */
@@ -246,10 +249,11 @@
             @OptimizationMode
             final int optimizationMode =
                     getAppOptimizationMode(
-                            mode, allowlistBackend.isAllowlisted(info.packageName, info.uid));
-            // Ignores default optimized/unknown state or system/default apps.
+                            mode,
+                            allowlistBackend.isAllowlisted(info.packageName, info.uid),
+                            /* ignoreUnknownMode= */ false);
+            // Ignores default optimized state or system/default apps.
             if (optimizationMode == MODE_OPTIMIZED
-                    || optimizationMode == MODE_UNKNOWN
                     || isSystemOrDefaultApp(
                             context, allowlistBackend, info.packageName, info.uid)) {
                 continue;
@@ -374,7 +378,8 @@
                         "\tStandbyMode: %s, allowListed: %s, mode: %s",
                         appStandbyMode,
                         allowListed,
-                        getAppOptimizationMode(appStandbyMode, allowListed));
+                        getAppOptimizationMode(
+                                appStandbyMode, allowListed, /* ignoreUnknownMode= */ false));
     }
 
     private static @DataChangeReason int toChangeReason(Action action) {
diff --git a/src/com/android/settings/fuelgauge/BatterySettingsStorage.java b/src/com/android/settings/fuelgauge/BatterySettingsStorage.java
index 33a8025..eeebbec 100644
--- a/src/com/android/settings/fuelgauge/BatterySettingsStorage.java
+++ b/src/com/android/settings/fuelgauge/BatterySettingsStorage.java
@@ -347,7 +347,9 @@
                         appOptModeMap.containsKey(info.uid)
                                 ? (int) appOptModeMap.get(info.uid).getResetOptimizationMode()
                                 : BatteryOptimizeUtils.getAppOptimizationMode(
-                                        mode, mAllowlistedApps.contains(info.packageName));
+                                        mode,
+                                        mAllowlistedApps.contains(info.packageName),
+                                        /* ignoreUnknownMode= */ false);
                 // Ignores default optimized/unknown state or system/default apps.
                 if (optimizationMode == BatteryOptimizeUtils.MODE_OPTIMIZED
                         || optimizationMode == BatteryOptimizeUtils.MODE_UNKNOWN
diff --git a/src/com/android/settings/fuelgauge/OptimizedPreferenceController.java b/src/com/android/settings/fuelgauge/OptimizedPreferenceController.java
deleted file mode 100644
index a26ab7a..0000000
--- a/src/com/android/settings/fuelgauge/OptimizedPreferenceController.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * 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.fuelgauge;
-
-import android.content.Context;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.widget.SelectorWithWidgetPreference;
-
-public class OptimizedPreferenceController extends AbstractPreferenceController
-        implements PreferenceControllerMixin {
-
-    private static final String TAG = "OPTIMIZED_PREF";
-
-    @VisibleForTesting static final String KEY_OPTIMIZED_PREF = "optimized_preference";
-    @VisibleForTesting BatteryOptimizeUtils mBatteryOptimizeUtils;
-
-    public OptimizedPreferenceController(Context context, int uid, String packageName) {
-        super(context);
-        mBatteryOptimizeUtils = new BatteryOptimizeUtils(context, uid, packageName);
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return true;
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        preference.setEnabled(mBatteryOptimizeUtils.isSelectorPreferenceEnabled());
-
-        final boolean isOptimized =
-                mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()
-                        || mBatteryOptimizeUtils.getAppOptimizationMode()
-                                == BatteryOptimizeUtils.MODE_OPTIMIZED;
-        ((SelectorWithWidgetPreference) preference).setChecked(isOptimized);
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return KEY_OPTIMIZED_PREF;
-    }
-
-    @Override
-    public boolean handlePreferenceTreeClick(Preference preference) {
-        return getPreferenceKey().equals(preference.getKey());
-    }
-}
diff --git a/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetail.java b/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetail.java
index e59cc4ad..dadf2e8 100644
--- a/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetail.java
@@ -24,11 +24,8 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.UserHandle;
-import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
-import android.widget.CompoundButton;
-import android.widget.CompoundButton.OnCheckedChangeListener;
 
 import androidx.annotation.VisibleForTesting;
 
@@ -44,8 +41,6 @@
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.widget.FooterPreference;
 import com.android.settingslib.widget.LayoutPreference;
-import com.android.settingslib.widget.MainSwitchPreference;
-import com.android.settingslib.widget.SelectorWithWidgetPreference;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -53,8 +48,7 @@
 import java.util.concurrent.Executors;
 
 /** Allow background usage fragment for each app */
-public class PowerBackgroundUsageDetail extends DashboardFragment
-        implements SelectorWithWidgetPreference.OnClickListener, OnCheckedChangeListener {
+public class PowerBackgroundUsageDetail extends DashboardFragment {
     private static final String TAG = "PowerBackgroundUsageDetail";
 
     public static final String EXTRA_UID = "extra_uid";
@@ -63,21 +57,15 @@
     public static final String EXTRA_POWER_USAGE_AMOUNT = "extra_power_usage_amount";
     public static final String EXTRA_ICON_ID = "extra_icon_id";
     private static final String KEY_PREF_HEADER = "header_view";
-    private static final String KEY_PREF_UNRESTRICTED = "unrestricted_preference";
-    private static final String KEY_PREF_OPTIMIZED = "optimized_preference";
-    private static final String KEY_ALLOW_BACKGROUND_USAGE = "allow_background_usage";
     private static final String KEY_FOOTER_PREFERENCE = "app_usage_footer_preference";
+    private static final String KEY_BATTERY_OPTIMIZATION_MODE_CATEGORY =
+            "battery_optimization_mode_category";
 
     private final ExecutorService mExecutor = Executors.newSingleThreadExecutor();
 
-    @VisibleForTesting LayoutPreference mHeaderPreference;
     @VisibleForTesting ApplicationsState mState;
     @VisibleForTesting ApplicationsState.AppEntry mAppEntry;
     @VisibleForTesting BatteryOptimizeUtils mBatteryOptimizeUtils;
-    @VisibleForTesting SelectorWithWidgetPreference mOptimizePreference;
-    @VisibleForTesting SelectorWithWidgetPreference mUnrestrictedPreference;
-    @VisibleForTesting MainSwitchPreference mMainSwitchPreference;
-    @VisibleForTesting FooterPreference mFooterPreference;
     @VisibleForTesting StringBuilder mLogStringBuilder;
 
     @VisibleForTesting @BatteryOptimizeUtils.OptimizationMode
@@ -87,17 +75,11 @@
     public void onAttach(Activity activity) {
         super.onAttach(activity);
 
+        final Bundle bundle = getArguments();
+        final int uid = bundle.getInt(EXTRA_UID, 0);
+        final String packageName = bundle.getString(EXTRA_PACKAGE_NAME);
+        mBatteryOptimizeUtils = new BatteryOptimizeUtils(getContext(), uid, packageName);
         mState = ApplicationsState.getInstance(getActivity().getApplication());
-    }
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        final String packageName = getArguments().getString(EXTRA_PACKAGE_NAME);
-        onCreateBackgroundUsageState(packageName);
-        mHeaderPreference = findPreference(KEY_PREF_HEADER);
-
         if (packageName != null) {
             mAppEntry = mState.getEntry(packageName, UserHandle.myUserId());
         }
@@ -107,8 +89,8 @@
     public void onResume() {
         super.onResume();
         initHeader();
-        mOptimizationMode = mBatteryOptimizeUtils.getAppOptimizationMode();
         initFooter();
+        mOptimizationMode = mBatteryOptimizeUtils.getAppOptimizationMode();
         mLogStringBuilder = new StringBuilder("onResume mode = ").append(mOptimizationMode);
     }
 
@@ -137,34 +119,16 @@
     }
 
     @Override
-    public void onRadioButtonClicked(SelectorWithWidgetPreference selected) {
-        final String selectedKey = selected == null ? null : selected.getKey();
-        updateSelectorPreferenceState(mUnrestrictedPreference, selectedKey);
-        updateSelectorPreferenceState(mOptimizePreference, selectedKey);
-        mBatteryOptimizeUtils.setAppUsageState(getSelectedPreference(), Action.APPLY);
-    }
-
-    @Override
-    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-        mMainSwitchPreference.setChecked(isChecked);
-        updateSelectorPreference(isChecked);
-    }
-
-    @Override
     public int getMetricsCategory() {
         return SettingsEnums.FUELGAUGE_POWER_USAGE_MANAGE_BACKGROUND;
     }
 
     @Override
     protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
-        final List<AbstractPreferenceController> controllers = new ArrayList<>();
-        final Bundle bundle = getArguments();
-        final int uid = bundle.getInt(EXTRA_UID, 0);
-        final String packageName = bundle.getString(EXTRA_PACKAGE_NAME);
-
-        controllers.add(new AllowBackgroundPreferenceController(context, uid, packageName));
-        controllers.add(new OptimizedPreferenceController(context, uid, packageName));
-        controllers.add(new UnrestrictedPreferenceController(context, uid, packageName));
+        final List<AbstractPreferenceController> controllers = new ArrayList<>(1);
+        controllers.add(
+                new BatteryOptimizationModePreferenceController(
+                        context, KEY_BATTERY_OPTIMIZATION_MODE_CATEGORY, mBatteryOptimizeUtils));
 
         return controllers;
     }
@@ -179,26 +143,6 @@
         return TAG;
     }
 
-    @VisibleForTesting
-    void updateSelectorPreference(boolean isEnabled) {
-        mOptimizePreference.setEnabled(isEnabled);
-        mUnrestrictedPreference.setEnabled(isEnabled);
-        onRadioButtonClicked(isEnabled ? mOptimizePreference : null);
-    }
-
-    @VisibleForTesting
-    int getSelectedPreference() {
-        if (!mMainSwitchPreference.isChecked()) {
-            return BatteryOptimizeUtils.MODE_RESTRICTED;
-        } else if (mUnrestrictedPreference.isChecked()) {
-            return BatteryOptimizeUtils.MODE_UNRESTRICTED;
-        } else if (mOptimizePreference.isChecked()) {
-            return BatteryOptimizeUtils.MODE_OPTIMIZED;
-        } else {
-            return BatteryOptimizeUtils.MODE_UNKNOWN;
-        }
-    }
-
     static void startPowerBackgroundUsageDetailPage(Context context, Bundle args) {
         new SubSettingLauncher(context)
                 .setDestination(PowerBackgroundUsageDetail.class.getName())
@@ -209,7 +153,11 @@
 
     @VisibleForTesting
     void initHeader() {
-        final View appSnippet = mHeaderPreference.findViewById(R.id.entity_header);
+        final LayoutPreference headerPreference = findPreference(KEY_PREF_HEADER);
+        if (headerPreference == null) {
+            return;
+        }
+        final View appSnippet = headerPreference.findViewById(R.id.entity_header);
         final Activity context = getActivity();
         final Bundle bundle = getArguments();
         EntityHeaderController controller =
@@ -239,58 +187,25 @@
 
     @VisibleForTesting
     void initFooter() {
-        final String stateString;
-        final String footerString;
-        final Context context = getContext();
-
-        if (mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()) {
-            // Present optimized only string when the package name is invalid.
-            stateString = context.getString(R.string.manager_battery_usage_optimized_only);
-            footerString =
-                    context.getString(R.string.manager_battery_usage_footer_limited, stateString);
-        } else if (mBatteryOptimizeUtils.isSystemOrDefaultApp()) {
-            // Present unrestricted only string when the package is system or default active app.
-            stateString = context.getString(R.string.manager_battery_usage_unrestricted_only);
-            footerString =
-                    context.getString(R.string.manager_battery_usage_footer_limited, stateString);
-        } else {
-            // Present default string to normal app.
-            footerString = context.getString(R.string.manager_battery_usage_footer);
+        final FooterPreference footerPreference = findPreference(KEY_FOOTER_PREFERENCE);
+        if (footerPreference == null) {
+            return;
         }
-        mFooterPreference.setTitle(footerString);
+        final Context context = getContext();
+        footerPreference.setTitle(context.getString(R.string.manager_battery_usage_footer));
         final Intent helpIntent =
                 HelpUtils.getHelpIntent(
                         context,
                         context.getString(R.string.help_url_app_usage_settings),
                         /* backupContext= */ "");
         if (helpIntent != null) {
-            mFooterPreference.setLearnMoreAction(
+            footerPreference.setLearnMoreAction(
                     v -> startActivityForResult(helpIntent, /* requestCode= */ 0));
-            mFooterPreference.setLearnMoreText(
+            footerPreference.setLearnMoreText(
                     context.getString(R.string.manager_battery_usage_link_a11y));
         }
     }
 
-    private void onCreateBackgroundUsageState(String packageName) {
-        mOptimizePreference = findPreference(KEY_PREF_OPTIMIZED);
-        mUnrestrictedPreference = findPreference(KEY_PREF_UNRESTRICTED);
-        mMainSwitchPreference = findPreference(KEY_ALLOW_BACKGROUND_USAGE);
-        mFooterPreference = findPreference(KEY_FOOTER_PREFERENCE);
-
-        mOptimizePreference.setOnClickListener(this);
-        mUnrestrictedPreference.setOnClickListener(this);
-        mMainSwitchPreference.addOnSwitchChangeListener(this);
-
-        mBatteryOptimizeUtils =
-                new BatteryOptimizeUtils(
-                        getContext(), getArguments().getInt(EXTRA_UID), packageName);
-    }
-
-    private void updateSelectorPreferenceState(
-            SelectorWithWidgetPreference preference, String selectedKey) {
-        preference.setChecked(TextUtils.equals(selectedKey, preference.getKey()));
-    }
-
     private void logMetricCategory(int currentOptimizeMode) {
         if (currentOptimizeMode == mOptimizationMode) {
             return;
diff --git a/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java b/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java
index d948cc0..9b070f9 100644
--- a/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java
+++ b/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.fuelgauge;
 
+import static com.android.settings.fuelgauge.BatteryOptimizeUtils.MODE_UNRESTRICTED;
+
 import android.Manifest;
 import android.content.DialogInterface;
 import android.content.pm.ApplicationInfo;
@@ -24,20 +26,20 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.PowerManager;
-import android.os.PowerWhitelistManager;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.android.internal.app.AlertActivity;
 import com.android.internal.app.AlertController;
 import com.android.settings.R;
+import com.android.settings.fuelgauge.BatteryOptimizeHistoricalLogEntry.Action;
 
 public class RequestIgnoreBatteryOptimizations extends AlertActivity
         implements DialogInterface.OnClickListener {
     private static final String TAG = "RequestIgnoreBatteryOptimizations";
     private static final boolean DEBUG = false;
 
-    private PowerWhitelistManager mPowerWhitelistManager;
-    private String mPackageName;
+    private ApplicationInfo mApplicationInfo;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -47,8 +49,6 @@
                         android.view.WindowManager.LayoutParams
                                 .SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
 
-        mPowerWhitelistManager = getSystemService(PowerWhitelistManager.class);
-
         Uri data = getIntent().getData();
         if (data == null) {
             debugLog(
@@ -56,17 +56,18 @@
             finish();
             return;
         }
-        mPackageName = data.getSchemeSpecificPart();
-        if (mPackageName == null) {
+        final String packageName = data.getSchemeSpecificPart();
+        if (TextUtils.isEmpty(packageName)) {
             debugLog(
                     "No data supplied for IGNORE_BATTERY_OPTIMIZATION_SETTINGS in: " + getIntent());
             finish();
             return;
         }
 
+        // Package in Unrestricted mode already ignoring the battery optimizations.
         PowerManager power = getSystemService(PowerManager.class);
-        if (power.isIgnoringBatteryOptimizations(mPackageName)) {
-            debugLog("Not should prompt, already ignoring optimizations: " + mPackageName);
+        if (power.isIgnoringBatteryOptimizations(packageName)) {
+            debugLog("Not should prompt, already ignoring optimizations: " + packageName);
             finish();
             return;
         }
@@ -74,29 +75,28 @@
         if (getPackageManager()
                         .checkPermission(
                                 Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS,
-                                mPackageName)
+                                packageName)
                 != PackageManager.PERMISSION_GRANTED) {
             debugLog(
                     "Requested package "
-                            + mPackageName
+                            + packageName
                             + " does not hold permission "
                             + Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
             finish();
             return;
         }
 
-        ApplicationInfo ai;
         try {
-            ai = getPackageManager().getApplicationInfo(mPackageName, 0);
+            mApplicationInfo = getPackageManager().getApplicationInfo(packageName, 0);
         } catch (PackageManager.NameNotFoundException e) {
-            debugLog("Requested package doesn't exist: " + mPackageName);
+            debugLog("Requested package doesn't exist: " + packageName);
             finish();
             return;
         }
 
         final AlertController.AlertParams p = mAlertParams;
         final CharSequence appLabel =
-                ai.loadSafeLabel(
+                mApplicationInfo.loadSafeLabel(
                         getPackageManager(),
                         PackageItemInfo.DEFAULT_MAX_LABEL_SIZE_PX,
                         PackageItemInfo.SAFE_LABEL_FLAG_TRIM
@@ -114,7 +114,12 @@
     public void onClick(DialogInterface dialog, int which) {
         switch (which) {
             case BUTTON_POSITIVE:
-                mPowerWhitelistManager.addToWhitelist(mPackageName);
+                BatteryOptimizeUtils batteryOptimizeUtils =
+                        new BatteryOptimizeUtils(
+                                getApplicationContext(),
+                                mApplicationInfo.uid,
+                                mApplicationInfo.packageName);
+                batteryOptimizeUtils.setAppUsageState(MODE_UNRESTRICTED, Action.APPLY);
                 break;
             case BUTTON_NEGATIVE:
                 break;
diff --git a/src/com/android/settings/fuelgauge/UnrestrictedPreferenceController.java b/src/com/android/settings/fuelgauge/UnrestrictedPreferenceController.java
deleted file mode 100644
index 652941b..0000000
--- a/src/com/android/settings/fuelgauge/UnrestrictedPreferenceController.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * 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.fuelgauge;
-
-import android.content.Context;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.widget.SelectorWithWidgetPreference;
-
-public class UnrestrictedPreferenceController extends AbstractPreferenceController
-        implements PreferenceControllerMixin {
-
-    private static final String TAG = "UNRESTRICTED_PREF";
-
-    @VisibleForTesting static final String KEY_UNRESTRICTED_PREF = "unrestricted_preference";
-
-    @VisibleForTesting BatteryOptimizeUtils mBatteryOptimizeUtils;
-
-    public UnrestrictedPreferenceController(Context context, int uid, String packageName) {
-        super(context);
-        mBatteryOptimizeUtils = new BatteryOptimizeUtils(context, uid, packageName);
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        preference.setEnabled(mBatteryOptimizeUtils.isSelectorPreferenceEnabled());
-
-        final boolean isUnrestricted =
-                mBatteryOptimizeUtils.getAppOptimizationMode()
-                        == BatteryOptimizeUtils.MODE_UNRESTRICTED;
-        ((SelectorWithWidgetPreference) preference).setChecked(isUnrestricted);
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return true;
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return KEY_UNRESTRICTED_PREF;
-    }
-
-    @Override
-    public boolean handlePreferenceTreeClick(Preference preference) {
-        return getPreferenceKey().equals(preference.getKey());
-    }
-}
diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScreen.kt b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScreen.kt
new file mode 100644
index 0000000..2226e37
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScreen.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2024 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.batterysaver
+
+import android.content.Context
+import com.android.settings.R
+import com.android.settings.flags.Flags
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenCreator
+
+@ProvidePreferenceScreen
+class BatterySaverScreen : PreferenceScreenCreator {
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.battery_saver
+
+    override val keywords: Int
+        get() = R.string.keywords_battery_saver
+
+    override fun isFlagEnabled(context: Context) = Flags.catalystBatterySaverScreen()
+
+    override fun fragmentClass() = BatterySaverSettings::class.java
+
+    override fun hasCompleteHierarchy() = false
+
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {}
+
+    companion object {
+        const val KEY = "battery_saver_screen"
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java
index 8e281de..df6c1d9 100644
--- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java
+++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java
@@ -17,8 +17,11 @@
 package com.android.settings.fuelgauge.batterysaver;
 
 import android.app.settings.SettingsEnums;
+import android.content.Context;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
 import com.android.settings.R;
@@ -93,4 +96,9 @@
             pref.setLearnMoreText(getString(R.string.battery_saver_link_a11y));
         }
     }
+
+    @Override
+    public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
+        return BatterySaverScreen.KEY;
+    }
 }
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java
index e6f622c..74c9c68 100644
--- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.fuelgauge.batterytip;
 
+import android.app.Activity;
 import android.content.Context;
 import android.os.BadParcelableException;
 import android.os.Bundle;
@@ -27,7 +28,6 @@
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
-import com.android.settings.SettingsActivity;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.fuelgauge.batterytip.actions.BatteryTipAction;
@@ -52,7 +52,7 @@
     private BatteryTipListener mBatteryTipListener;
     private List<BatteryTip> mBatteryTips;
     private Map<String, BatteryTip> mBatteryTipMap;
-    private SettingsActivity mSettingsActivity;
+    private Activity mActivity;
     private MetricsFeatureProvider mMetricsFeatureProvider;
     private boolean mNeedUpdate;
     @VisibleForTesting TipCardPreference mCardPreference;
@@ -66,8 +66,8 @@
         mNeedUpdate = true;
     }
 
-    public void setActivity(SettingsActivity activity) {
-        mSettingsActivity = activity;
+    public void setActivity(Activity activity) {
+        mActivity = activity;
     }
 
     public void setFragment(InstrumentedPreferenceFragment fragment) {
@@ -126,7 +126,7 @@
             } else {
                 final BatteryTipAction action =
                         BatteryTipUtils.getActionForBatteryTip(
-                                batteryTip, mSettingsActivity, mFragment);
+                                batteryTip, mActivity, mFragment);
                 if (action != null) {
                     action.handlePositiveAction(mFragment.getMetricsCategory());
                 }
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java
index 7dc993c..c6603d7 100644
--- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java
@@ -16,16 +16,15 @@
 
 package com.android.settings.fuelgauge.batterytip;
 
+import android.app.Activity;
 import android.app.AppOpsManager;
 import android.content.Context;
-import android.content.Intent;
 import android.os.UserHandle;
 import android.os.UserManager;
 
 import androidx.annotation.NonNull;
 
 import com.android.internal.util.CollectionUtils;
-import com.android.settings.SettingsActivity;
 import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.fuelgauge.batterytip.actions.BatteryTipAction;
 import com.android.settings.fuelgauge.batterytip.actions.OpenBatterySaverAction;
@@ -33,8 +32,6 @@
 import com.android.settings.fuelgauge.batterytip.actions.RestrictAppAction;
 import com.android.settings.fuelgauge.batterytip.actions.SmartBatteryAction;
 import com.android.settings.fuelgauge.batterytip.actions.UnrestrictAppAction;
-import com.android.settings.fuelgauge.batterytip.tips.AppLabelPredicate;
-import com.android.settings.fuelgauge.batterytip.tips.AppRestrictionPredicate;
 import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
 import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip;
 import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip;
@@ -52,7 +49,7 @@
             AppOpsManager appOpsManager, UserManager userManager) {
         final List<UserHandle> userHandles = userManager.getUserProfiles();
         final List<AppOpsManager.PackageOps> packageOpsList =
-                appOpsManager.getPackagesForOps(new int[] {AppOpsManager.OP_RUN_ANY_IN_BACKGROUND});
+                appOpsManager.getPackagesForOps(new int[]{AppOpsManager.OP_RUN_ANY_IN_BACKGROUND});
         final List<AppInfo> appInfos = new ArrayList<>();
 
         for (int i = 0, size = CollectionUtils.size(packageOpsList); i < size; i++) {
@@ -65,7 +62,7 @@
                 }
                 if (entry.getMode() != AppOpsManager.MODE_ALLOWED
                         && userHandles.contains(
-                                new UserHandle(UserHandle.getUserId(packageOps.getUid())))) {
+                            new UserHandle(UserHandle.getUserId(packageOps.getUid())))) {
                     appInfos.add(
                             new AppInfo.Builder()
                                     .setPackageName(packageOps.getPackageName())
@@ -82,34 +79,34 @@
      * Get a corresponding action based on {@code batteryTip}
      *
      * @param batteryTip used to detect which action to choose
-     * @param settingsActivity used to populate {@link BatteryTipAction}
-     * @param fragment used to populate {@link BatteryTipAction}
+     * @param activity   used to populate {@link BatteryTipAction}
+     * @param fragment   used to populate {@link BatteryTipAction}
      * @return an action for {@code batteryTip}
      */
     public static BatteryTipAction getActionForBatteryTip(
             BatteryTip batteryTip,
-            SettingsActivity settingsActivity,
+            Activity activity,
             InstrumentedPreferenceFragment fragment) {
         switch (batteryTip.getType()) {
             case BatteryTip.TipType.SMART_BATTERY_MANAGER:
-                return new SmartBatteryAction(settingsActivity, fragment);
+                return new SmartBatteryAction(activity, fragment);
             case BatteryTip.TipType.BATTERY_SAVER:
             case BatteryTip.TipType.LOW_BATTERY:
-                return new OpenBatterySaverAction(settingsActivity);
+                return new OpenBatterySaverAction(activity);
             case BatteryTip.TipType.APP_RESTRICTION:
                 if (batteryTip.getState() == BatteryTip.StateType.HANDLED) {
                     return new OpenRestrictAppFragmentAction(fragment, (RestrictAppTip) batteryTip);
                 } else {
-                    return new RestrictAppAction(settingsActivity, (RestrictAppTip) batteryTip);
+                    return new RestrictAppAction(activity, (RestrictAppTip) batteryTip);
                 }
             case BatteryTip.TipType.REMOVE_APP_RESTRICTION:
-                return new UnrestrictAppAction(settingsActivity, (UnrestrictAppTip) batteryTip);
+                return new UnrestrictAppAction(activity, (UnrestrictAppTip) batteryTip);
             default:
                 return null;
         }
     }
 
-   /** Detect and return anomaly apps after {@code timeAfterMs} */
+    /** Detect and return anomaly apps after {@code timeAfterMs} */
     public static List<AppInfo> detectAnomalies(Context context, long timeAfterMs) {
         return new ArrayList<>();
     }
diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java
index 55c0031..b2d6647 100644
--- a/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java
+++ b/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java
@@ -16,23 +16,23 @@
 
 package com.android.settings.fuelgauge.batterytip.actions;
 
+import android.app.Activity;
 import android.app.settings.SettingsEnums;
 
 import androidx.fragment.app.Fragment;
 
 import com.android.settings.R;
-import com.android.settings.SettingsActivity;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.fuelgauge.SmartBatterySettings;
 import com.android.settingslib.core.instrumentation.Instrumentable;
 
 public class SmartBatteryAction extends BatteryTipAction {
-    private SettingsActivity mSettingsActivity;
+    private Activity mActivity;
     private Fragment mFragment;
 
-    public SmartBatteryAction(SettingsActivity settingsActivity, Fragment fragment) {
-        super(settingsActivity.getApplicationContext());
-        mSettingsActivity = settingsActivity;
+    public SmartBatteryAction(Activity activity, Fragment fragment) {
+        super(activity.getApplicationContext());
+        mActivity = activity;
         mFragment = fragment;
     }
 
@@ -41,7 +41,7 @@
     public void handlePositiveAction(int metricsKey) {
         mMetricsFeatureProvider.action(
                 mContext, SettingsEnums.ACTION_TIP_OPEN_SMART_BATTERY, metricsKey);
-        new SubSettingLauncher(mSettingsActivity)
+        new SubSettingLauncher(mActivity)
                 .setSourceMetricsCategory(
                         mFragment instanceof Instrumentable
                                 ? ((Instrumentable) mFragment).getMetricsCategory()
diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryOptimizationModeCache.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryOptimizationModeCache.java
index 2084b66..076676d 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryOptimizationModeCache.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryOptimizationModeCache.java
@@ -51,7 +51,8 @@
                     Pair.create(
                             BatteryOptimizationMode.forNumber(
                                     batteryOptimizeUtils.getAppOptimizationMode(
-                                            /* refreshList= */ false)),
+                                            /* refreshList= */ false,
+                                            /* ignoreUnknownMode= */ false)),
                             batteryOptimizeUtils.isOptimizeModeMutable()));
         }
         final Pair<BatteryOptimizationMode, Boolean> batteryOptimizeModeInfo =
diff --git a/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummary.java
index 5ef820c..b5581d0 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummary.java
@@ -18,6 +18,7 @@
 
 import static com.android.settings.fuelgauge.BatteryBroadcastReceiver.BatteryUpdateType;
 
+import android.app.Activity;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.database.ContentObserver;
@@ -26,13 +27,14 @@
 import android.os.Handler;
 import android.provider.Settings.Global;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.loader.app.LoaderManager;
 import androidx.loader.content.Loader;
 import androidx.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
 import com.android.settings.fuelgauge.BatteryHeaderPreferenceController;
 import com.android.settings.fuelgauge.BatteryInfo;
@@ -125,7 +127,7 @@
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
-        final SettingsActivity activity = (SettingsActivity) getActivity();
+        final Activity activity = getActivity();
 
         mBatteryHeaderPreferenceController = use(BatteryHeaderPreferenceController.class);
 
@@ -270,4 +272,9 @@
 
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider(R.xml.power_usage_summary);
+
+    @Override
+    public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
+        return PowerUsageSummaryScreen.KEY;
+    }
 }
diff --git a/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryScreen.kt b/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryScreen.kt
new file mode 100644
index 0000000..229e308
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryScreen.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2024 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.batteryusage
+
+import android.content.Context
+import com.android.settings.R
+import com.android.settings.flags.Flags
+import com.android.settingslib.metadata.PreferenceAvailabilityProvider
+import com.android.settingslib.metadata.PreferenceIconProvider
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenCreator
+
+@ProvidePreferenceScreen
+class PowerUsageSummaryScreen : PreferenceScreenCreator,
+    PreferenceAvailabilityProvider,
+    PreferenceIconProvider {
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.power_usage_summary_title
+
+    override val keywords: Int
+        get() = R.string.keywords_battery
+
+    override fun isFlagEnabled(context: Context) = Flags.catalystPowerUsageSummaryScreen()
+
+    override fun hasCompleteHierarchy() = false
+
+    override fun fragmentClass() = PowerUsageSummary::class.java
+
+    override fun isAvailable(context: Context) =
+        context.resources.getBoolean(R.bool.config_show_top_level_battery)
+
+    override fun getIcon(context: Context): Int =
+        if (Flags.homepageRevamp()) {
+            R.drawable.ic_settings_battery_filled
+        } else {
+            R.drawable.ic_settings_battery_white
+        }
+
+
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {}
+
+    companion object {
+        const val KEY = "power_usage_summary_screen"
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/gestures/ButtonNavigationSettingsAssistController.java b/src/com/android/settings/gestures/ButtonNavigationSettingsAssistController.java
index 4c5e28c..72f8339 100644
--- a/src/com/android/settings/gestures/ButtonNavigationSettingsAssistController.java
+++ b/src/com/android/settings/gestures/ButtonNavigationSettingsAssistController.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.gestures;
 
+import static android.app.contextualsearch.ContextualSearchManager.FEATURE_CONTEXTUAL_SEARCH;
 import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON_OVERLAY;
 import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY;
 
@@ -50,6 +51,11 @@
 
     @Override
     public int getAvailabilityStatus() {
+        // Hide the existing assistant UI elements when contextual search is available.
+        if (mContext.getPackageManager().hasSystemFeature(FEATURE_CONTEXTUAL_SEARCH)) {
+            return UNSUPPORTED_ON_DEVICE;
+        }
+
         if (SystemNavigationPreferenceController.isOverlayPackageAvailable(mContext,
                 NAV_BAR_MODE_2BUTTON_OVERLAY)
                 || SystemNavigationPreferenceController.isOverlayPackageAvailable(mContext,
diff --git a/src/com/android/settings/gestures/NavigationSettingsContextualSearchController.java b/src/com/android/settings/gestures/NavigationSettingsContextualSearchController.java
new file mode 100644
index 0000000..5938b5f
--- /dev/null
+++ b/src/com/android/settings/gestures/NavigationSettingsContextualSearchController.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2024 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.gestures;
+
+import static android.app.contextualsearch.ContextualSearchManager.FEATURE_CONTEXTUAL_SEARCH;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.annotation.NonNull;
+
+import com.android.settings.core.TogglePreferenceController;
+
+/**
+ * Configures behaviour of Contextual Search setting.
+ */
+public class NavigationSettingsContextualSearchController extends TogglePreferenceController {
+
+    public NavigationSettingsContextualSearchController(@NonNull Context context,
+            @NonNull String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public boolean isChecked() {
+        boolean onByDefault = mContext.getResources().getBoolean(
+                com.android.internal.R.bool.config_searchAllEntrypointsEnabledDefault);
+        return Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.SEARCH_ALL_ENTRYPOINTS_ENABLED, onByDefault ? 1 : 0)
+                == 1;
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        return Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.SEARCH_ALL_ENTRYPOINTS_ENABLED, isChecked ? 1 : 0);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if (mContext.getPackageManager().hasSystemFeature(FEATURE_CONTEXTUAL_SEARCH)) {
+            return AVAILABLE;
+        }
+        return UNSUPPORTED_ON_DEVICE;
+    }
+
+    @Override
+    public boolean isSliceable() {
+        return false;
+    }
+
+    @Override
+    public int getSliceHighlightMenuRes() {
+        return NO_RES;
+    }
+}
diff --git a/src/com/android/settings/inputmethod/InputSettingPreferenceController.java b/src/com/android/settings/inputmethod/InputSettingPreferenceController.java
index 6d462c2..8dda8c5 100644
--- a/src/com/android/settings/inputmethod/InputSettingPreferenceController.java
+++ b/src/com/android/settings/inputmethod/InputSettingPreferenceController.java
@@ -25,20 +25,31 @@
 import android.net.Uri;
 import android.os.Handler;
 import android.os.UserHandle;
+import android.view.View;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
+import android.widget.SeekBar;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
 import androidx.lifecycle.LifecycleObserver;
 import androidx.lifecycle.OnLifecycleEvent;
 import androidx.preference.Preference;
 
+import com.android.settings.R;
 import com.android.settings.core.TogglePreferenceController;
 import com.android.settings.keyboard.Flags;
 
+import java.util.concurrent.TimeUnit;
+
 /**
  * Abstract class for toggle controllers of Keyboard input setting related function.
  */
 public abstract class InputSettingPreferenceController extends TogglePreferenceController implements
         LifecycleObserver {
+    private static final int CUSTOM_PROGRESS_INTERVAL = 100;
+    private static final long MILLISECOND_IN_SECONDS = TimeUnit.SECONDS.toMillis(1);
     private final ContentResolver mContentResolver;
     private final ContentObserver mContentObserver = new ContentObserver(new Handler(true)) {
         @Override
@@ -48,11 +59,19 @@
             }
         }
     };
+    protected AlertDialog mAlertDialog;
 
     protected abstract void onInputSettingUpdated();
 
     protected abstract Uri getSettingUri();
 
+    protected void updateInputSettingKeysValue(int thresholdTimeMillis) {
+    }
+
+    protected int getInputSettingKeysValue() {
+        return 0;
+    }
+
     public InputSettingPreferenceController(@NonNull Context context,
             @NonNull String preferenceKey) {
         super(context, preferenceKey);
@@ -100,4 +119,112 @@
     private void unregisterSettingsObserver() {
         mContentResolver.unregisterContentObserver(mContentObserver);
     }
+
+    protected void constructDialog(Context context, int titleRes, int subtitleRes) {
+        mAlertDialog = new AlertDialog.Builder(context)
+                .setView(R.layout.dialog_keyboard_a11y_input_setting_keys)
+                .setPositiveButton(android.R.string.ok,
+                        (dialog, which) -> {
+                            RadioGroup radioGroup =
+                                    mAlertDialog.findViewById(
+                                            R.id.input_setting_keys_value_group);
+                            SeekBar seekbar = mAlertDialog.findViewById(
+                                    R.id.input_setting_keys_value_custom_slider);
+                            RadioButton customRadioButton = mAlertDialog.findViewById(
+                                    R.id.input_setting_keys_value_custom);
+                            int threshold;
+                            if (customRadioButton.isChecked()) {
+                                threshold = seekbar.getProgress() * CUSTOM_PROGRESS_INTERVAL;
+                            } else {
+                                int checkedRadioButtonId = radioGroup.getCheckedRadioButtonId();
+                                if (checkedRadioButtonId == R.id.input_setting_keys_value_600) {
+                                    threshold = 600;
+                                } else if (checkedRadioButtonId
+                                        == R.id.input_setting_keys_value_400) {
+                                    threshold = 400;
+                                } else if (checkedRadioButtonId
+                                        == R.id.input_setting_keys_value_200) {
+                                    threshold = 200;
+                                } else {
+                                    threshold = 0;
+                                }
+                            }
+                            updateInputSettingKeysValue(threshold);
+                        })
+                .setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.dismiss())
+                .create();
+        mAlertDialog.setOnShowListener(dialog -> {
+            RadioGroup cannedValueRadioGroup = mAlertDialog.findViewById(
+                    R.id.input_setting_keys_value_group);
+            RadioButton customRadioButton = mAlertDialog.findViewById(
+                    R.id.input_setting_keys_value_custom);
+            TextView customValueTextView = mAlertDialog.findViewById(
+                    R.id.input_setting_keys_value_custom_value);
+            SeekBar customProgressBar = mAlertDialog.findViewById(
+                    R.id.input_setting_keys_value_custom_slider);
+            TextView titleTextView = mAlertDialog.findViewById(
+                    R.id.input_setting_keys_dialog_title);
+            TextView subTitleTextView = mAlertDialog.findViewById(
+                    R.id.input_setting_keys_dialog_subtitle);
+            titleTextView.setText(titleRes);
+            subTitleTextView.setText(subtitleRes);
+
+            customProgressBar.incrementProgressBy(CUSTOM_PROGRESS_INTERVAL);
+            customProgressBar.setProgress(1);
+            View customValueView = mAlertDialog.findViewById(
+                    R.id.input_setting_keys_custom_value_option);
+            customValueView.setOnClickListener(l -> customRadioButton.performClick());
+            customRadioButton.setOnCheckedChangeListener((buttonView, isChecked) -> {
+                if (isChecked) {
+                    cannedValueRadioGroup.clearCheck();
+                }
+                customValueTextView.setVisibility(isChecked ? View.VISIBLE : View.GONE);
+                customValueTextView.setText(
+                        progressToThresholdInSecond(customProgressBar.getProgress()));
+                customProgressBar.setVisibility(isChecked ? View.VISIBLE : View.GONE);
+                buttonView.setChecked(isChecked);
+            });
+            cannedValueRadioGroup.setOnCheckedChangeListener(
+                    (group, checkedId) -> customRadioButton.setChecked(false));
+            customProgressBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+                @Override
+                public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+                    customValueTextView.setText(progressToThresholdInSecond(progress));
+                }
+
+                @Override
+                public void onStartTrackingTouch(SeekBar seekBar) {
+                }
+
+                @Override
+                public void onStopTrackingTouch(SeekBar seekBar) {
+                }
+            });
+            initStateBasedOnThreshold(cannedValueRadioGroup, customRadioButton, customValueTextView,
+                    customProgressBar);
+        });
+    }
+
+    private static String progressToThresholdInSecond(int progress) {
+        return String.valueOf((double) progress * CUSTOM_PROGRESS_INTERVAL
+                / MILLISECOND_IN_SECONDS);
+    }
+
+    private void initStateBasedOnThreshold(RadioGroup cannedValueRadioGroup,
+            RadioButton customRadioButton, TextView customValueTextView,
+            SeekBar customProgressBar) {
+        int inputSettingKeysThreshold = getInputSettingKeysValue();
+        switch (inputSettingKeysThreshold) {
+            case 600 -> cannedValueRadioGroup.check(R.id.input_setting_keys_value_600);
+            case 400 -> cannedValueRadioGroup.check(R.id.input_setting_keys_value_400);
+            case 0, 200 -> cannedValueRadioGroup.check(R.id.input_setting_keys_value_200);
+            default -> {
+                customValueTextView.setText(
+                        String.valueOf(
+                                (double) inputSettingKeysThreshold / MILLISECOND_IN_SECONDS));
+                customProgressBar.setProgress(inputSettingKeysThreshold / CUSTOM_PROGRESS_INTERVAL);
+                customRadioButton.setChecked(true);
+            }
+        }
+    }
 }
diff --git a/src/com/android/settings/inputmethod/KeyboardAccessibilityBounceKeysController.java b/src/com/android/settings/inputmethod/KeyboardAccessibilityBounceKeysController.java
index 1652f00..6bd836f 100644
--- a/src/com/android/settings/inputmethod/KeyboardAccessibilityBounceKeysController.java
+++ b/src/com/android/settings/inputmethod/KeyboardAccessibilityBounceKeysController.java
@@ -21,15 +21,9 @@
 import android.net.Uri;
 import android.provider.Settings;
 import android.text.TextUtils;
-import android.view.View;
-import android.widget.RadioButton;
-import android.widget.RadioGroup;
-import android.widget.SeekBar;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
 import androidx.lifecycle.LifecycleObserver;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
@@ -37,23 +31,19 @@
 import com.android.settings.R;
 import com.android.settingslib.PrimarySwitchPreference;
 
-import java.util.concurrent.TimeUnit;
-
 public class KeyboardAccessibilityBounceKeysController extends
         InputSettingPreferenceController implements
         LifecycleObserver {
-    private static final int CUSTOM_PROGRESS_INTERVAL = 100;
-    private static final long MILLISECOND_IN_SECONDS = TimeUnit.SECONDS.toMillis(1);
     public static final int BOUNCE_KEYS_THRESHOLD = 500;
 
-    private AlertDialog mAlertDialog;
     @Nullable
     private PrimarySwitchPreference mPrimaryPreference;
 
     public KeyboardAccessibilityBounceKeysController(@NonNull Context context,
             @NonNull String key) {
         super(context, key);
-        constructDialog(context);
+        constructDialog(context, R.string.bounce_keys_dialog_title,
+                R.string.bounce_keys_dialog_subtitle);
     }
 
     @Override
@@ -87,8 +77,7 @@
 
     @Override
     public boolean setChecked(boolean isChecked) {
-        InputSettings.setAccessibilityBounceKeysThreshold(mContext,
-                isChecked ? BOUNCE_KEYS_THRESHOLD : 0);
+        updateInputSettingKeysValue(isChecked ? BOUNCE_KEYS_THRESHOLD : 0);
         return true;
     }
 
@@ -106,94 +95,13 @@
                 Settings.Secure.ACCESSIBILITY_BOUNCE_KEYS);
     }
 
-    private void constructDialog(Context context) {
-        mAlertDialog = new AlertDialog.Builder(context)
-                .setView(R.layout.dialog_a11y_bounce_key)
-                .setPositiveButton(android.R.string.ok,
-                        (dialog, which) -> {
-                            RadioGroup radioGroup =
-                                    mAlertDialog.findViewById(R.id.bounce_key_value_group);
-                            SeekBar seekbar = mAlertDialog.findViewById(
-                                    R.id.bounce_key_value_custom_slider);
-                            RadioButton customRadioButton = mAlertDialog.findViewById(
-                                    R.id.bounce_key_value_custom);
-                            int threshold;
-                            if (customRadioButton.isChecked()) {
-                                threshold = seekbar.getProgress() * CUSTOM_PROGRESS_INTERVAL;
-                            } else {
-                                int checkedRadioButtonId = radioGroup.getCheckedRadioButtonId();
-                                threshold = checkedRadioButtonId == R.id.bounce_key_value_600 ? 600
-                                        : checkedRadioButtonId == R.id.bounce_key_value_400 ? 400
-                                                : checkedRadioButtonId == R.id.bounce_key_value_200
-                                                        ? 200 : 0;
-                            }
-                            InputSettings.setAccessibilityBounceKeysThreshold(context, threshold);
-                        })
-                .setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.dismiss())
-                .create();
-        mAlertDialog.setOnShowListener(dialog -> {
-            RadioGroup cannedValueRadioGroup = mAlertDialog.findViewById(
-                    R.id.bounce_key_value_group);
-            RadioButton customRadioButton = mAlertDialog.findViewById(R.id.bounce_key_value_custom);
-            TextView customValueTextView = mAlertDialog.findViewById(
-                    R.id.bounce_key_value_custom_value);
-            SeekBar customProgressBar = mAlertDialog.findViewById(
-                    R.id.bounce_key_value_custom_slider);
-            customProgressBar.incrementProgressBy(CUSTOM_PROGRESS_INTERVAL);
-            customProgressBar.setProgress(1);
-            View customValueView = mAlertDialog.findViewById(R.id.custom_value_option);
-            customValueView.setOnClickListener(l -> customRadioButton.performClick());
-            customRadioButton.setOnCheckedChangeListener((buttonView, isChecked) -> {
-                if (isChecked) {
-                    cannedValueRadioGroup.clearCheck();
-                }
-                customValueTextView.setVisibility(isChecked ? View.VISIBLE : View.GONE);
-                customValueTextView.setText(
-                        progressToThresholdInSecond(customProgressBar.getProgress()));
-                customProgressBar.setVisibility(isChecked ? View.VISIBLE : View.GONE);
-                buttonView.setChecked(isChecked);
-            });
-            cannedValueRadioGroup.setOnCheckedChangeListener(
-                    (group, checkedId) -> customRadioButton.setChecked(false));
-            customProgressBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
-                @Override
-                public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-                    customValueTextView.setText(progressToThresholdInSecond(progress));
-                }
-
-                @Override
-                public void onStartTrackingTouch(SeekBar seekBar) {
-                }
-
-                @Override
-                public void onStopTrackingTouch(SeekBar seekBar) {
-                }
-            });
-            initStateBasedOnThreshold(cannedValueRadioGroup, customRadioButton, customValueTextView,
-                    customProgressBar);
-        });
+    @Override
+    protected void updateInputSettingKeysValue(int thresholdTimeMillis) {
+        InputSettings.setAccessibilityBounceKeysThreshold(mContext, thresholdTimeMillis);
     }
 
-    private static String progressToThresholdInSecond(int progress) {
-        return String.valueOf((double) progress * CUSTOM_PROGRESS_INTERVAL
-                / MILLISECOND_IN_SECONDS);
-    }
-
-    private void initStateBasedOnThreshold(RadioGroup cannedValueRadioGroup,
-            RadioButton customRadioButton, TextView customValueTextView,
-            SeekBar customProgressBar) {
-        int bounceKeysThreshold = InputSettings.getAccessibilityBounceKeysThreshold(mContext);
-        switch (bounceKeysThreshold) {
-            case 600 -> cannedValueRadioGroup.check(R.id.bounce_key_value_600);
-            case 400 -> cannedValueRadioGroup.check(R.id.bounce_key_value_400);
-            case 0, 200 -> cannedValueRadioGroup.check(R.id.bounce_key_value_200);
-            default -> {
-                customValueTextView.setText(
-                        String.valueOf(
-                                (double) bounceKeysThreshold / MILLISECOND_IN_SECONDS));
-                customProgressBar.setProgress(bounceKeysThreshold / CUSTOM_PROGRESS_INTERVAL);
-                customRadioButton.setChecked(true);
-            }
-        }
+    @Override
+    protected int getInputSettingKeysValue() {
+        return InputSettings.getAccessibilityBounceKeysThreshold(mContext);
     }
 }
diff --git a/src/com/android/settings/inputmethod/KeyboardAccessibilitySlowKeysController.java b/src/com/android/settings/inputmethod/KeyboardAccessibilitySlowKeysController.java
index d8602df..857623a 100644
--- a/src/com/android/settings/inputmethod/KeyboardAccessibilitySlowKeysController.java
+++ b/src/com/android/settings/inputmethod/KeyboardAccessibilitySlowKeysController.java
@@ -20,27 +20,34 @@
 import android.hardware.input.InputSettings;
 import android.net.Uri;
 import android.provider.Settings;
+import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.lifecycle.LifecycleObserver;
+import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
-import androidx.preference.TwoStatePreference;
+
+import com.android.settings.R;
+import com.android.settingslib.PrimarySwitchPreference;
 
 public class KeyboardAccessibilitySlowKeysController extends
         InputSettingPreferenceController implements
         LifecycleObserver {
     public static final int SLOW_KEYS_THRESHOLD = 500;
 
-    private TwoStatePreference mTwoStatePreference;
+    @Nullable
+    private PrimarySwitchPreference mPrimarySwitchPreference;
 
     public KeyboardAccessibilitySlowKeysController(@NonNull Context context, @NonNull String key) {
         super(context, key);
+        constructDialog(context, R.string.slow_keys, R.string.slow_keys_summary);
     }
 
     @Override
     public void displayPreference(@NonNull PreferenceScreen screen) {
         super.displayPreference(screen);
-        mTwoStatePreference = screen.findPreference(getPreferenceKey());
+        mPrimarySwitchPreference = screen.findPreference(getPreferenceKey());
     }
 
     @Override
@@ -50,8 +57,7 @@
 
     @Override
     public boolean setChecked(boolean isChecked) {
-        InputSettings.setAccessibilitySlowKeysThreshold(mContext,
-                isChecked ? SLOW_KEYS_THRESHOLD : 0);
+        updateInputSettingKeysValue(isChecked ? SLOW_KEYS_THRESHOLD : 0);
         return true;
     }
 
@@ -64,8 +70,8 @@
 
     @Override
     protected void onInputSettingUpdated() {
-        if (mTwoStatePreference != null) {
-            mTwoStatePreference.setChecked(
+        if (mPrimarySwitchPreference != null) {
+            mPrimarySwitchPreference.setChecked(
                     InputSettings.isAccessibilitySlowKeysEnabled(mContext));
         }
     }
@@ -75,4 +81,25 @@
         return Settings.Secure.getUriFor(
                 Settings.Secure.ACCESSIBILITY_SLOW_KEYS);
     }
+
+    @Override
+    public boolean handlePreferenceTreeClick(@NonNull Preference preference) {
+        if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
+            return false;
+        }
+        if (mAlertDialog != null) {
+            mAlertDialog.show();
+        }
+        return true;
+    }
+
+    @Override
+    protected void updateInputSettingKeysValue(int thresholdTimeMillis) {
+        InputSettings.setAccessibilitySlowKeysThreshold(mContext, thresholdTimeMillis);
+    }
+
+    @Override
+    protected int getInputSettingKeysValue() {
+        return InputSettings.getAccessibilitySlowKeysThreshold(mContext);
+    }
 }
diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
index 48100a3..edc9989 100644
--- a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
+++ b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
@@ -289,11 +289,12 @@
                 getActivity().finish();
                 return;
             }
-            ThreadUtils.postOnMainThread(() -> updateHardKeyboards(newHardKeyboards));
+            ThreadUtils.postOnMainThread(() -> updateHardKeyboards(context, newHardKeyboards));
         });
     }
 
-    private void updateHardKeyboards(@NonNull List<HardKeyboardDeviceInfo> newHardKeyboards) {
+    private void updateHardKeyboards(@NonNull Context context,
+                                     @NonNull List<HardKeyboardDeviceInfo> newHardKeyboards) {
         if (Objects.equals(mLastHardKeyboards, newHardKeyboards)) {
             // Nothing has changed.  Ignore.
             return;
@@ -316,7 +317,7 @@
             final Preference pref = new Preference(getPrefContext());
             pref.setTitle(hardKeyboardDeviceInfo.mDeviceName);
             String currentLayout =
-                    NewKeyboardSettingsUtils.getSelectedKeyboardLayoutLabelForUser(getContext(),
+                    NewKeyboardSettingsUtils.getSelectedKeyboardLayoutLabelForUser(context,
                             UserHandle.myUserId(), hardKeyboardDeviceInfo.mDeviceIdentifier);
             if (currentLayout != null) {
                 pref.setSummary(currentLayout);
@@ -336,7 +337,7 @@
             vendorAndProductId.append("-");
             vendorAndProductId.append(productId);
             mMetricsFeatureProvider.action(
-                    getContext(),
+                    context,
                     SettingsEnums.ACTION_USE_SPECIFIC_KEYBOARD,
                     vendorAndProductId.toString());
         }
@@ -352,10 +353,10 @@
                 || InputSettings.isAccessibilityMouseKeysFeatureFlagEnabled()) {
             Objects.requireNonNull(mKeyboardA11yCategory).setOrder(2);
             preferenceScreen.addPreference(mKeyboardA11yCategory);
-            updateAccessibilityBounceKeysSwitch();
-            updateAccessibilitySlowKeysSwitch();
-            updateAccessibilityStickyKeysSwitch();
-            updateAccessibilityMouseKeysSwitch();
+            updateAccessibilityBounceKeysSwitch(context);
+            updateAccessibilitySlowKeysSwitch(context);
+            updateAccessibilityStickyKeysSwitch(context);
+            updateAccessibilityMouseKeysSwitch(context);
         }
     }
 
@@ -413,46 +414,47 @@
                     mContentObserver,
                     UserHandle.myUserId());
         }
-        updateAccessibilityBounceKeysSwitch();
-        updateAccessibilitySlowKeysSwitch();
-        updateAccessibilityStickyKeysSwitch();
-        updateAccessibilityMouseKeysSwitch();
+        final Context context = getContext();
+        updateAccessibilityBounceKeysSwitch(context);
+        updateAccessibilitySlowKeysSwitch(context);
+        updateAccessibilityStickyKeysSwitch(context);
+        updateAccessibilityMouseKeysSwitch(context);
     }
 
     private void unregisterSettingsObserver() {
         getActivity().getContentResolver().unregisterContentObserver(mContentObserver);
     }
 
-    private void updateAccessibilityBounceKeysSwitch() {
+    private void updateAccessibilityBounceKeysSwitch(@NonNull Context context) {
         if (!InputSettings.isAccessibilityBounceKeysFeatureEnabled()) {
             return;
         }
         Objects.requireNonNull(mAccessibilityBounceKeys).setChecked(
-                InputSettings.isAccessibilityBounceKeysEnabled(getContext()));
+                InputSettings.isAccessibilityBounceKeysEnabled(context));
     }
 
-    private void updateAccessibilitySlowKeysSwitch() {
+    private void updateAccessibilitySlowKeysSwitch(@NonNull Context context) {
         if (!InputSettings.isAccessibilitySlowKeysFeatureFlagEnabled()) {
             return;
         }
         Objects.requireNonNull(mAccessibilitySlowKeys).setChecked(
-                InputSettings.isAccessibilitySlowKeysEnabled(getContext()));
+                InputSettings.isAccessibilitySlowKeysEnabled(context));
     }
 
-    private void updateAccessibilityStickyKeysSwitch() {
+    private void updateAccessibilityStickyKeysSwitch(@NonNull Context context) {
         if (!InputSettings.isAccessibilityStickyKeysFeatureEnabled()) {
             return;
         }
         Objects.requireNonNull(mAccessibilityStickyKeys).setChecked(
-                InputSettings.isAccessibilityStickyKeysEnabled(getContext()));
+                InputSettings.isAccessibilityStickyKeysEnabled(context));
     }
 
-    private void updateAccessibilityMouseKeysSwitch() {
+    private void updateAccessibilityMouseKeysSwitch(@NonNull Context context) {
         if (!InputSettings.isAccessibilityMouseKeysFeatureFlagEnabled()) {
             return;
         }
         Objects.requireNonNull(mAccessibilityMouseKeys).setChecked(
-                InputSettings.isAccessibilityMouseKeysEnabled(getContext()));
+                InputSettings.isAccessibilityMouseKeysEnabled(context));
     }
 
     private void toggleKeyboardShortcutsMenu() {
@@ -489,13 +491,13 @@
         @Override
         public void onChange(boolean selfChange, Uri uri) {
             if (sAccessibilityBounceKeysUri.equals(uri)) {
-                updateAccessibilityBounceKeysSwitch();
+                updateAccessibilityBounceKeysSwitch(getContext());
             } else if (sAccessibilitySlowKeysUri.equals(uri)) {
-                updateAccessibilitySlowKeysSwitch();
+                updateAccessibilitySlowKeysSwitch(getContext());
             } else if (sAccessibilityStickyKeysUri.equals(uri)) {
-                updateAccessibilityStickyKeysSwitch();
+                updateAccessibilityStickyKeysSwitch(getContext());
             } else if (sAccessibilityMouseKeysUri.equals(uri)) {
-                updateAccessibilityMouseKeysSwitch();
+                updateAccessibilityMouseKeysSwitch(getContext());
             }
         }
     };
diff --git a/src/com/android/settings/location/LocationScreen.kt b/src/com/android/settings/location/LocationScreen.kt
new file mode 100644
index 0000000..d45b762
--- /dev/null
+++ b/src/com/android/settings/location/LocationScreen.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2024 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.location
+
+import android.content.Context
+import android.location.LocationManager
+import com.android.settings.R
+import com.android.settings.flags.Flags
+import com.android.settingslib.metadata.PreferenceIconProvider
+import com.android.settingslib.metadata.PreferenceSummaryProvider
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenCreator
+
+@ProvidePreferenceScreen
+class LocationScreen : PreferenceScreenCreator, PreferenceSummaryProvider, PreferenceIconProvider {
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.location_settings_title
+
+    override val keywords: Int
+        get() = R.string.keywords_location
+
+    override fun getSummary(context: Context): CharSequence? {
+        var locationManager = context.getSystemService(Context.LOCATION_SERVICE) as LocationManager
+        return if (locationManager.isLocationEnabled) {
+            context.getString(R.string.location_settings_loading_app_permission_stats)
+        } else {
+            context.getString(R.string.location_settings_summary_location_off)
+        }
+    }
+
+    override fun getIcon(context: Context) =
+        when {
+            Flags.homepageRevamp() -> R.drawable.ic_settings_location_filled
+            else -> R.drawable.ic_settings_location
+        }
+
+    override fun isFlagEnabled(context: Context) = Flags.catalystLocationSettings()
+
+    override fun hasCompleteHierarchy() = false
+
+    override fun fragmentClass() = LocationSettings::class.java
+
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {}
+
+    companion object {
+        const val KEY = "location_settings"
+    }
+}
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
index 87e8817..6a1d3d2 100644
--- a/src/com/android/settings/location/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -29,6 +29,8 @@
 import android.provider.Settings;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceGroup;
 
@@ -185,4 +187,9 @@
                     R.string.location_settings_tooltip_text_for_chrome));
         }
     }
+
+    @Override
+    public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
+        return LocationScreen.KEY;
+    }
 }
diff --git a/src/com/android/settings/network/MobileNetworkListFragment.kt b/src/com/android/settings/network/MobileNetworkListFragment.kt
index 3118088..a0da636 100644
--- a/src/com/android/settings/network/MobileNetworkListFragment.kt
+++ b/src/com/android/settings/network/MobileNetworkListFragment.kt
@@ -92,4 +92,6 @@
                 simRepositoryFactory(context).canEnterMobileNetworkPage()
         }
     }
+
+    override fun getPreferenceScreenBindingKey(context: Context) = MobileNetworkListScreen.KEY
 }
diff --git a/src/com/android/settings/network/MobileNetworkListScreen.kt b/src/com/android/settings/network/MobileNetworkListScreen.kt
new file mode 100644
index 0000000..93d8ee6
--- /dev/null
+++ b/src/com/android/settings/network/MobileNetworkListScreen.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2024 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 android.content.Context
+import com.android.settings.R
+import com.android.settings.flags.Flags
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenCreator
+
+@ProvidePreferenceScreen
+class MobileNetworkListScreen : PreferenceScreenCreator {
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.provider_network_settings_title
+
+    override val icon: Int
+        get() = R.drawable.ic_sim_card
+
+    override val keywords: Int
+        get() = R.string.keywords_more_mobile_networks
+
+    override fun isFlagEnabled(context: Context) = Flags.catalystMobileNetworkList()
+
+    override fun hasCompleteHierarchy() = false
+
+    override fun fragmentClass() = MobileNetworkListFragment::class.java
+
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {}
+
+    companion object {
+        const val KEY = "mobile_network_list"
+    }
+}
diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java
index ee7d440..2585d04 100644
--- a/src/com/android/settings/network/NetworkDashboardFragment.java
+++ b/src/com/android/settings/network/NetworkDashboardFragment.java
@@ -19,6 +19,7 @@
 import android.content.Context;
 import android.content.Intent;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.android.settings.R;
@@ -115,4 +116,9 @@
                     return buildPreferenceControllers(context, null /* lifecycle */);
                 }
             };
+
+    @Override
+    public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
+        return NetworkDashboardScreen.KEY;
+    }
 }
diff --git a/src/com/android/settings/network/NetworkDashboardScreen.kt b/src/com/android/settings/network/NetworkDashboardScreen.kt
new file mode 100644
index 0000000..ad4ca41
--- /dev/null
+++ b/src/com/android/settings/network/NetworkDashboardScreen.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2024 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 android.content.Context
+import com.android.settings.R
+import com.android.settings.flags.Flags
+import com.android.settingslib.metadata.PreferenceIconProvider
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenCreator
+
+@ProvidePreferenceScreen
+class NetworkDashboardScreen : PreferenceScreenCreator, PreferenceIconProvider {
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.network_dashboard_title
+
+    override fun getIcon(context: Context) =
+        when {
+            Flags.homepageRevamp() -> R.drawable.ic_settings_wireless_filled
+            else -> R.drawable.ic_settings_wireless
+        }
+
+    override fun isFlagEnabled(context: Context) = Flags.catalystNetworkProviderAndInternetScreen()
+
+    override fun hasCompleteHierarchy() = false
+
+    override fun fragmentClass() = NetworkDashboardFragment::class.java
+
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {}
+
+    companion object {
+        const val KEY = "network_provider_and_internet_screen"
+    }
+}
diff --git a/src/com/android/settings/network/NetworkProviderSettings.java b/src/com/android/settings/network/NetworkProviderSettings.java
index 69183ff..b268461 100644
--- a/src/com/android/settings/network/NetworkProviderSettings.java
+++ b/src/com/android/settings/network/NetworkProviderSettings.java
@@ -64,8 +64,8 @@
 
 import com.android.settings.AirplaneModeEnabler;
 import com.android.settings.R;
-import com.android.settings.RestrictedSettingsFragment;
 import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.dashboard.RestrictedDashboardFragment;
 import com.android.settings.datausage.DataUsagePreference;
 import com.android.settings.datausage.DataUsageUtils;
 import com.android.settings.location.WifiScanningFragment;
@@ -104,7 +104,7 @@
  * UI for Mobile network and Wi-Fi network settings.
  */
 @SearchIndexable
-public class NetworkProviderSettings extends RestrictedSettingsFragment
+public class NetworkProviderSettings extends RestrictedDashboardFragment
         implements Indexable, WifiPickerTracker.WifiPickerTrackerCallback,
         WifiDialog2.WifiDialog2Listener, DialogInterface.OnDismissListener,
         AirplaneModeEnabler.OnAirplaneModeChangedListener, InternetUpdater.InternetChangeListener {
@@ -356,9 +356,17 @@
         mIsGuest = userManager.isGuestUser();
     }
 
-    private void addPreferences() {
-        addPreferencesFromResource(R.xml.network_provider_settings);
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
 
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.network_provider_settings;
+    }
+
+    private void addPreferences() {
         mAirplaneModeMsgPreference = findPreference(PREF_KEY_AIRPLANE_MODE_MSG);
         updateAirplaneModeMsgPreference(mAirplaneModeEnabler.isAirplaneModeOn() /* visible */);
         mConnectedWifiEntryPreferenceCategory = findPreference(PREF_KEY_CONNECTED_ACCESS_POINTS);
diff --git a/src/com/android/settings/network/apn/ApnEditor.java b/src/com/android/settings/network/apn/ApnEditor.java
index dc9741d..533fd29 100644
--- a/src/com/android/settings/network/apn/ApnEditor.java
+++ b/src/com/android/settings/network/apn/ApnEditor.java
@@ -16,153 +16,33 @@
 
 package com.android.settings.network.apn;
 
-import android.app.Dialog;
+import static com.android.settings.network.apn.ApnEditPageProviderKt.EDIT_URL;
+import static com.android.settings.network.apn.ApnEditPageProviderKt.INSERT_URL;
+
 import android.app.settings.SettingsEnums;
-import android.content.ContentValues;
-import android.content.Context;
 import android.content.Intent;
-import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.PersistableBundle;
 import android.os.UserManager;
 import android.provider.Telephony;
 import android.telephony.CarrierConfigManager;
-import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-import android.text.TextUtils;
 import android.util.Log;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.View.OnKeyListener;
 
-import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-import androidx.preference.EditTextPreference;
-import androidx.preference.ListPreference;
-import androidx.preference.MultiSelectListPreference;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.TwoStatePreference;
 
 import com.android.internal.util.ArrayUtils;
-import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import com.android.settings.network.ProxySubscriptionManager;
-import com.android.settingslib.utils.ThreadUtils;
+import com.android.settings.spa.SpaActivity;
 
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Objects;
-import java.util.Set;
 
 /** Use to edit apn settings. */
-public class ApnEditor extends SettingsPreferenceFragment
-        implements OnPreferenceChangeListener, OnKeyListener {
+public class ApnEditor extends SettingsPreferenceFragment {
 
     private static final String TAG = ApnEditor.class.getSimpleName();
-    private static final boolean VDBG = false;   // STOPSHIP if true
-
-    private static final String KEY_AUTH_TYPE = "auth_type";
-    private static final String KEY_APN_TYPE = "apn_type";
-    private static final String KEY_PROTOCOL = "apn_protocol";
-    private static final String KEY_ROAMING_PROTOCOL = "apn_roaming_protocol";
-    private static final String KEY_CARRIER_ENABLED = "carrier_enabled";
-    private static final String KEY_BEARER_MULTI = "bearer_multi";
-    private static final String KEY_MVNO_TYPE = "mvno_type";
-    private static final String KEY_PASSWORD = "apn_password";
-
-    @VisibleForTesting
-    static final int MENU_DELETE = Menu.FIRST;
-    private static final int MENU_SAVE = Menu.FIRST + 1;
-    private static final int MENU_CANCEL = Menu.FIRST + 2;
-
-    @VisibleForTesting
-    static String sNotSet;
-    @VisibleForTesting
-    EditTextPreference mName;
-    @VisibleForTesting
-    EditTextPreference mApn;
-    @VisibleForTesting
-    EditTextPreference mProxy;
-    @VisibleForTesting
-    EditTextPreference mPort;
-    @VisibleForTesting
-    EditTextPreference mUser;
-    @VisibleForTesting
-    EditTextPreference mServer;
-    @VisibleForTesting
-    EditTextPreference mPassword;
-    @VisibleForTesting
-    EditTextPreference mMmsc;
-    @VisibleForTesting
-    EditTextPreference mMcc;
-    @VisibleForTesting
-    EditTextPreference mMnc;
-    @VisibleForTesting
-    EditTextPreference mMmsProxy;
-    @VisibleForTesting
-    EditTextPreference mMmsPort;
-    @VisibleForTesting
-    ListPreference mAuthType;
-    @VisibleForTesting
-    EditTextPreference mApnType;
-    @VisibleForTesting
-    ListPreference mProtocol;
-    @VisibleForTesting
-    ListPreference mRoamingProtocol;
-    @VisibleForTesting
-    TwoStatePreference mCarrierEnabled;
-    @VisibleForTesting
-    MultiSelectListPreference mBearerMulti;
-    @VisibleForTesting
-    ListPreference mMvnoType;
-    @VisibleForTesting
-    EditTextPreference mMvnoMatchData;
-
-    @VisibleForTesting
-    ApnData mApnData;
-
-    private String mCurMnc;
-    private String mCurMcc;
-
-    private boolean mNewApn;
-    private int mSubId;
-    @VisibleForTesting
-    ProxySubscriptionManager mProxySubscriptionMgr;
-    private int mBearerInitialVal = 0;
-    private String mMvnoTypeStr;
-    private String mMvnoMatchDataStr;
-    @VisibleForTesting
-    String[] mReadOnlyApnTypes;
-    @VisibleForTesting
-    String[] mDefaultApnTypes;
-    @VisibleForTesting
-    String mDefaultApnProtocol;
-    @VisibleForTesting
-    String mDefaultApnRoamingProtocol;
-    private String[] mReadOnlyApnFields;
-    private boolean mReadOnlyApn;
-    /**
-     * The APN deletion feature within menu is aligned with the APN adding feature.
-     * Having only one of them could lead to a UX which not that make sense from user's
-     * perspective.
-     *
-     * mIsAddApnAllowed stores the configuration value reading from
-     * CarrierConfigManager.KEY_ALLOW_ADDING_APNS_BOOL to support the presentation
-     * control of the menu options. When false, delete option would be invisible to
-     * the end user.
-     */
-    private boolean mIsAddApnAllowed;
-    private Uri mCarrierUri;
-    private boolean mIsCarrierIdApn;
 
     /**
      * APN types for data connections.  These are usage categories for an APN
@@ -225,150 +105,41 @@
         APN_TYPE_OEM_PRIVATE,
     };
 
-    /**
-     * Standard projection for the interesting columns of a normal note.
-     */
-    private static final String[] sProjection = new String[] {
-            Telephony.Carriers._ID,     // 0
-            Telephony.Carriers.NAME,    // 1
-            Telephony.Carriers.APN,     // 2
-            Telephony.Carriers.PROXY,   // 3
-            Telephony.Carriers.PORT,    // 4
-            Telephony.Carriers.USER,    // 5
-            Telephony.Carriers.SERVER,  // 6
-            Telephony.Carriers.PASSWORD, // 7
-            Telephony.Carriers.MMSC, // 8
-            Telephony.Carriers.MCC, // 9
-            Telephony.Carriers.MNC, // 10
-            Telephony.Carriers.NUMERIC, // 11
-            Telephony.Carriers.MMSPROXY, // 12
-            Telephony.Carriers.MMSPORT, // 13
-            Telephony.Carriers.AUTH_TYPE, // 14
-            Telephony.Carriers.TYPE, // 15
-            Telephony.Carriers.PROTOCOL, // 16
-            Telephony.Carriers.CARRIER_ENABLED, // 17
-            Telephony.Carriers.BEARER, // 18
-            Telephony.Carriers.BEARER_BITMASK, // 19
-            Telephony.Carriers.ROAMING_PROTOCOL, // 20
-            Telephony.Carriers.MVNO_TYPE,   // 21
-            Telephony.Carriers.MVNO_MATCH_DATA,  // 22
-            Telephony.Carriers.EDITED_STATUS,   // 23
-            Telephony.Carriers.USER_EDITABLE,   // 24
-            Telephony.Carriers.CARRIER_ID       // 25
-    };
-
-    private static final int ID_INDEX = 0;
-    @VisibleForTesting
-    static final int NAME_INDEX = 1;
-    @VisibleForTesting
-    static final int APN_INDEX = 2;
-    private static final int PROXY_INDEX = 3;
-    private static final int PORT_INDEX = 4;
-    private static final int USER_INDEX = 5;
-    private static final int SERVER_INDEX = 6;
-    private static final int PASSWORD_INDEX = 7;
-    private static final int MMSC_INDEX = 8;
-    @VisibleForTesting
-    static final int MCC_INDEX = 9;
-    @VisibleForTesting
-    static final int MNC_INDEX = 10;
-    private static final int MMSPROXY_INDEX = 12;
-    private static final int MMSPORT_INDEX = 13;
-    private static final int AUTH_TYPE_INDEX = 14;
-    @VisibleForTesting
-    static final int TYPE_INDEX = 15;
-    @VisibleForTesting
-    static final int PROTOCOL_INDEX = 16;
-    @VisibleForTesting
-    static final int CARRIER_ENABLED_INDEX = 17;
-    private static final int BEARER_INDEX = 18;
-    private static final int BEARER_BITMASK_INDEX = 19;
-    @VisibleForTesting
-    static final int ROAMING_PROTOCOL_INDEX = 20;
-    private static final int MVNO_TYPE_INDEX = 21;
-    private static final int MVNO_MATCH_DATA_INDEX = 22;
-    private static final int EDITED_INDEX = 23;
-    private static final int USER_EDITABLE_INDEX = 24;
-    private static final int CARRIER_ID_INDEX = 25;
-
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
+        maybeRedirectToNewPage();
+        finish();
+    }
+
+    private void maybeRedirectToNewPage() {
         if (isUserRestricted()) {
             Log.e(TAG, "This setting isn't available due to user restriction.");
-            finish();
             return;
         }
 
-        setLifecycleForAllControllers();
-
         final Intent intent = getIntent();
         final String action = intent.getAction();
-        if (TextUtils.isEmpty(action)) {
-            finish();
-            return;
-        }
-        mSubId = intent.getIntExtra(ApnSettings.SUB_ID,
-                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
 
-        initApnEditorUi();
-        getCarrierCustomizedConfig(getContext());
+        int subId =
+                intent.getIntExtra(ApnSettings.SUB_ID, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
 
-        Uri uri = null;
-        if (action.equals(Intent.ACTION_EDIT)) {
-            uri = intent.getData();
+        Uri uri = intent.getData();
+        if (Intent.ACTION_EDIT.equals(action)) {
             if (!uri.isPathPrefixMatch(Telephony.Carriers.CONTENT_URI)) {
                 Log.e(TAG, "Edit request not for carrier table. Uri: " + uri);
-                finish();
-                return;
+            } else {
+                String route = ApnEditPageProvider.INSTANCE.getRoute(EDIT_URL, uri, subId);
+                SpaActivity.startSpaActivity(requireContext(), route);
             }
-        } else if (action.equals(Intent.ACTION_INSERT)) {
-            mCarrierUri = intent.getData();
-            if (!mCarrierUri.isPathPrefixMatch(Telephony.Carriers.CONTENT_URI)) {
-                Log.e(TAG, "Insert request not for carrier table. Uri: " + mCarrierUri);
-                finish();
-                return;
+        } else if (Intent.ACTION_INSERT.equals(action)) {
+            if (!uri.isPathPrefixMatch(Telephony.Carriers.CONTENT_URI)) {
+                Log.e(TAG, "Insert request not for carrier table. Uri: " + uri);
+            } else {
+                String route = ApnEditPageProvider.INSTANCE.getRoute(
+                        INSERT_URL, Telephony.Carriers.CONTENT_URI, subId);
+                SpaActivity.startSpaActivity(getContext(), route);
             }
-            mNewApn = true;
-            mMvnoTypeStr = intent.getStringExtra(ApnSettings.MVNO_TYPE);
-            mMvnoMatchDataStr = intent.getStringExtra(ApnSettings.MVNO_MATCH_DATA);
-        } else {
-            finish();
-            return;
-        }
-
-        // Creates an ApnData to store the apn data temporary, so that we don't need the cursor to
-        // get the apn data. The uri is null if the action is ACTION_INSERT, that mean there is no
-        // record in the database, so create a empty ApnData to represent a empty row of database.
-        if (uri != null) {
-            mApnData = getApnDataFromUri(uri);
-        } else {
-            mApnData = new ApnData(sProjection.length);
-        }
-        final int carrierId = mApnData.getInteger(CARRIER_ID_INDEX,
-                TelephonyManager.UNKNOWN_CARRIER_ID);
-        mIsCarrierIdApn = (carrierId > TelephonyManager.UNKNOWN_CARRIER_ID);
-
-        final boolean isUserEdited = mApnData.getInteger(EDITED_INDEX,
-                Telephony.Carriers.USER_EDITED) == Telephony.Carriers.USER_EDITED;
-
-        Log.d(TAG, "onCreate: EDITED " + isUserEdited);
-        // if it's not a USER_EDITED apn, check if it's read-only
-        if (!isUserEdited && (mApnData.getInteger(USER_EDITABLE_INDEX, 1) == 0
-                || apnTypesMatch(mReadOnlyApnTypes, mApnData.getString(TYPE_INDEX)))) {
-            Log.d(TAG, "onCreate: apnTypesMatch; read-only APN");
-            mReadOnlyApn = true;
-            disableAllFields();
-        } else if (!ArrayUtils.isEmpty(mReadOnlyApnFields)) {
-            disableFields(mReadOnlyApnFields);
-        }
-        // Make sure that a user cannot break carrier id APN matching
-        if (mIsCarrierIdApn) {
-            disableFieldsForCarrieridApn();
-        }
-
-        for (int i = 0; i < getPreferenceScreen().getPreferenceCount(); i++) {
-            getPreferenceScreen().getPreference(i).setOnPreferenceChangeListener(this);
         }
     }
 
@@ -385,44 +156,6 @@
     }
 
     /**
-     * Enable ProxySubscriptionMgr with Lifecycle support for all controllers
-     * live within this fragment
-     */
-    private void setLifecycleForAllControllers() {
-        if (mProxySubscriptionMgr == null) {
-            mProxySubscriptionMgr = ProxySubscriptionManager.getInstance(getContext());
-        }
-        mProxySubscriptionMgr.setLifecycle(getLifecycle());
-    }
-
-    @Override
-    public void onViewStateRestored(@Nullable Bundle savedInstanceState) {
-        super.onViewStateRestored(savedInstanceState);
-        fillUI(savedInstanceState == null);
-        setCarrierCustomizedConfigToUi();
-    }
-
-    @VisibleForTesting
-    static String formatInteger(String value) {
-        try {
-            final int intValue = Integer.parseInt(value);
-            return String.format(getCorrectDigitsFormat(value), intValue);
-        } catch (NumberFormatException e) {
-            return value;
-        }
-    }
-
-    /**
-     * Get the digits format so we preserve leading 0's.
-     * MCCs are 3 digits and MNCs are either 2 or 3.
-     */
-    static String getCorrectDigitsFormat(String value) {
-        if (value.length() == 2) return "%02d";
-        else return "%03d";
-    }
-
-
-    /**
      * Check if passed in array of APN types indicates all APN types
      * @param apnTypes array of APN types. "*" indicates all types.
      * @return true if all apn types are included in the array, false otherwise
@@ -447,1046 +180,12 @@
         return true;
     }
 
-    /**
-     * Check if APN types overlap.
-     * @param apnTypesArray1 array of APNs. Empty array indicates no APN type; "*" indicates all
-     *                       types
-     * @param apnTypes2 comma separated string of APN types. Empty string represents all types.
-     * @return if any apn type matches return true, otherwise return false
-     */
-    private boolean apnTypesMatch(String[] apnTypesArray1, String apnTypes2) {
-        if (ArrayUtils.isEmpty(apnTypesArray1)) {
-            return false;
-        }
-
-        final String[] apnTypesArray1LowerCase = new String[apnTypesArray1.length];
-        for (int i = 0; i < apnTypesArray1.length; i++) {
-            apnTypesArray1LowerCase[i] = apnTypesArray1[i].toLowerCase();
-        }
-
-        if (hasAllApns(apnTypesArray1LowerCase) || TextUtils.isEmpty(apnTypes2)) {
-            return true;
-        }
-
-        final List apnTypesList1 = Arrays.asList(apnTypesArray1LowerCase);
-        final String[] apnTypesArray2 = apnTypes2.split(",");
-
-        for (String apn : apnTypesArray2) {
-            if (apnTypesList1.contains(apn.trim().toLowerCase())) {
-                Log.d(TAG, "apnTypesMatch: true because match found for " + apn.trim());
-                return true;
-            }
-        }
-
-        Log.d(TAG, "apnTypesMatch: false");
-        return false;
-    }
-
-    /**
-     * Function to get Preference obj corresponding to an apnField
-     * @param apnField apn field name for which pref is needed
-     * @return Preference obj corresponding to passed in apnField
-     */
-    private Preference getPreferenceFromFieldName(String apnField) {
-        switch (apnField) {
-            case Telephony.Carriers.NAME:
-                return mName;
-            case Telephony.Carriers.APN:
-                return mApn;
-            case Telephony.Carriers.PROXY:
-                return mProxy;
-            case Telephony.Carriers.PORT:
-                return mPort;
-            case Telephony.Carriers.USER:
-                return mUser;
-            case Telephony.Carriers.SERVER:
-                return mServer;
-            case Telephony.Carriers.PASSWORD:
-                return mPassword;
-            case Telephony.Carriers.MMSPROXY:
-                return mMmsProxy;
-            case Telephony.Carriers.MMSPORT:
-                return mMmsPort;
-            case Telephony.Carriers.MMSC:
-                return mMmsc;
-            case Telephony.Carriers.MCC:
-                return mMcc;
-            case Telephony.Carriers.MNC:
-                return mMnc;
-            case Telephony.Carriers.TYPE:
-                return mApnType;
-            case Telephony.Carriers.AUTH_TYPE:
-                return mAuthType;
-            case Telephony.Carriers.PROTOCOL:
-                return mProtocol;
-            case Telephony.Carriers.ROAMING_PROTOCOL:
-                return mRoamingProtocol;
-            case Telephony.Carriers.CARRIER_ENABLED:
-                return mCarrierEnabled;
-            case Telephony.Carriers.BEARER:
-            case Telephony.Carriers.BEARER_BITMASK:
-                return mBearerMulti;
-            case Telephony.Carriers.MVNO_TYPE:
-                return mMvnoType;
-            case Telephony.Carriers.MVNO_MATCH_DATA:
-                return mMvnoMatchData;
-        }
-        return null;
-    }
-
-    /**
-     * Disables given fields so that user cannot modify them
-     *
-     * @param apnFields fields to be disabled
-     */
-    private void disableFields(String[] apnFields) {
-        for (String apnField : apnFields) {
-            final Preference preference = getPreferenceFromFieldName(apnField);
-            if (preference != null) {
-                preference.setEnabled(false);
-            }
-        }
-    }
-
-    /**
-     * Disables all fields so that user cannot modify the APN
-     */
-    private void disableAllFields() {
-        mName.setEnabled(false);
-        mApn.setEnabled(false);
-        mProxy.setEnabled(false);
-        mPort.setEnabled(false);
-        mUser.setEnabled(false);
-        mServer.setEnabled(false);
-        mPassword.setEnabled(false);
-        mMmsProxy.setEnabled(false);
-        mMmsPort.setEnabled(false);
-        mMmsc.setEnabled(false);
-        mMcc.setEnabled(false);
-        mMnc.setEnabled(false);
-        mApnType.setEnabled(false);
-        mAuthType.setEnabled(false);
-        mProtocol.setEnabled(false);
-        mRoamingProtocol.setEnabled(false);
-        mCarrierEnabled.setEnabled(false);
-        mBearerMulti.setEnabled(false);
-        mMvnoType.setEnabled(false);
-        mMvnoMatchData.setEnabled(false);
-    }
-
-    /**
-     * Disables fields for a carrier id APN to avoid breaking the match criteria
-     */
-    private void disableFieldsForCarrieridApn() {
-        mMcc.setEnabled(false);
-        mMnc.setEnabled(false);
-        mMvnoType.setEnabled(false);
-        mMvnoMatchData.setEnabled(false);
-    }
-
     @Override
     public int getMetricsCategory() {
         return SettingsEnums.APN_EDITOR;
     }
 
     @VisibleForTesting
-    void fillUI(boolean firstTime) {
-        if (firstTime) {
-            // Fill in all the values from the db in both text editor and summary
-            mName.setText(mApnData.getString(NAME_INDEX));
-            mApn.setText(mApnData.getString(APN_INDEX));
-            mProxy.setText(mApnData.getString(PROXY_INDEX));
-            mPort.setText(mApnData.getString(PORT_INDEX));
-            mUser.setText(mApnData.getString(USER_INDEX));
-            mServer.setText(mApnData.getString(SERVER_INDEX));
-            mPassword.setText(mApnData.getString(PASSWORD_INDEX));
-            mMmsProxy.setText(mApnData.getString(MMSPROXY_INDEX));
-            mMmsPort.setText(mApnData.getString(MMSPORT_INDEX));
-            mMmsc.setText(mApnData.getString(MMSC_INDEX));
-            mMcc.setText(mApnData.getString(MCC_INDEX));
-            mMnc.setText(mApnData.getString(MNC_INDEX));
-            mApnType.setText(mApnData.getString(TYPE_INDEX));
-            if (mNewApn) {
-                final SubscriptionInfo subInfo =
-                        mProxySubscriptionMgr.getAccessibleSubscriptionInfo(mSubId);
-
-                // Country code
-                final String mcc = (subInfo == null) ? null : subInfo.getMccString();
-                // Network code
-                final String mnc = (subInfo == null) ? null : subInfo.getMncString();
-
-                if (!TextUtils.isEmpty(mcc)) {
-                    // Auto populate MNC and MCC for new entries, based on what SIM reports
-                    mMcc.setText(mcc);
-                    mMnc.setText(mnc);
-                    mCurMnc = mnc;
-                    mCurMcc = mcc;
-                }
-            }
-            final int authVal = mApnData.getInteger(AUTH_TYPE_INDEX, -1);
-            if (authVal != -1) {
-                mAuthType.setValueIndex(authVal);
-            } else {
-                mAuthType.setValue(null);
-            }
-
-            mProtocol.setValue(mApnData.getString(PROTOCOL_INDEX));
-            mRoamingProtocol.setValue(mApnData.getString(ROAMING_PROTOCOL_INDEX));
-            mCarrierEnabled.setChecked(mApnData.getInteger(CARRIER_ENABLED_INDEX, 1) == 1);
-            mBearerInitialVal = mApnData.getInteger(BEARER_INDEX, 0);
-
-            final HashSet<String> bearers = new HashSet<String>();
-            int bearerBitmask = mApnData.getInteger(BEARER_BITMASK_INDEX, 0);
-            if (bearerBitmask == 0) {
-                if (mBearerInitialVal == 0) {
-                    bearers.add("" + 0);
-                }
-            } else {
-                int i = 1;
-                while (bearerBitmask != 0) {
-                    if ((bearerBitmask & 1) == 1) {
-                        bearers.add("" + i);
-                    }
-                    bearerBitmask >>= 1;
-                    i++;
-                }
-            }
-
-            if (mBearerInitialVal != 0 && !bearers.contains("" + mBearerInitialVal)) {
-                // add mBearerInitialVal to bearers
-                bearers.add("" + mBearerInitialVal);
-            }
-            mBearerMulti.setValues(bearers);
-
-            mMvnoType.setValue(mApnData.getString(MVNO_TYPE_INDEX));
-            mMvnoMatchData.setEnabled(false);
-            mMvnoMatchData.setText(mApnData.getString(MVNO_MATCH_DATA_INDEX));
-            if (mNewApn && mMvnoTypeStr != null && mMvnoMatchDataStr != null) {
-                mMvnoType.setValue(mMvnoTypeStr);
-                mMvnoMatchData.setText(mMvnoMatchDataStr);
-            }
-        }
-
-        mName.setSummary(checkNull(mName.getText()));
-        mApn.setSummary(checkNull(mApn.getText()));
-        mProxy.setSummary(checkNull(mProxy.getText()));
-        mPort.setSummary(checkNull(mPort.getText()));
-        mUser.setSummary(checkNull(mUser.getText()));
-        mServer.setSummary(checkNull(mServer.getText()));
-        mPassword.setSummary(starify(mPassword.getText()));
-        mMmsProxy.setSummary(checkNull(mMmsProxy.getText()));
-        mMmsPort.setSummary(checkNull(mMmsPort.getText()));
-        mMmsc.setSummary(checkNull(mMmsc.getText()));
-        mMcc.setSummary(formatInteger(checkNull(mMcc.getText())));
-        mMnc.setSummary(formatInteger(checkNull(mMnc.getText())));
-        mApnType.setSummary(checkNull(mApnType.getText()));
-
-        final String authVal = mAuthType.getValue();
-        if (authVal != null) {
-            final int authValIndex = Integer.parseInt(authVal);
-            mAuthType.setValueIndex(authValIndex);
-
-            final String[] values = getResources().getStringArray(R.array.apn_auth_entries);
-            mAuthType.setSummary(values[authValIndex]);
-        } else {
-            mAuthType.setSummary(sNotSet);
-        }
-
-        mProtocol.setSummary(checkNull(protocolDescription(mProtocol.getValue(), mProtocol)));
-        mRoamingProtocol.setSummary(
-                checkNull(protocolDescription(mRoamingProtocol.getValue(), mRoamingProtocol)));
-        mBearerMulti.setSummary(
-                checkNull(bearerMultiDescription(mBearerMulti.getValues())));
-        mMvnoType.setSummary(
-                checkNull(mvnoDescription(mMvnoType.getValue())));
-        mMvnoMatchData.setSummary(checkNullforMvnoValue(mMvnoMatchData.getText()));
-        // allow user to edit carrier_enabled for some APN
-        final boolean ceEditable = getResources().getBoolean(
-                R.bool.config_allow_edit_carrier_enabled);
-        if (ceEditable) {
-            mCarrierEnabled.setEnabled(true);
-        } else {
-            mCarrierEnabled.setEnabled(false);
-        }
-    }
-
-    /**
-     * Returns the UI choice (e.g., "IPv4/IPv6") corresponding to the given
-     * raw value of the protocol preference (e.g., "IPV4V6"). If unknown,
-     * return null.
-     */
-    private String protocolDescription(String raw, ListPreference protocol) {
-        String uRaw = checkNull(raw).toUpperCase();
-        uRaw = uRaw.equals("IPV4") ? "IP" : uRaw;
-        final int protocolIndex = protocol.findIndexOfValue(uRaw);
-        if (protocolIndex == -1) {
-            return null;
-        } else {
-            final String[] values = getResources().getStringArray(R.array.apn_protocol_entries);
-            try {
-                return values[protocolIndex];
-            } catch (ArrayIndexOutOfBoundsException e) {
-                return null;
-            }
-        }
-    }
-
-    private String bearerMultiDescription(Set<String> raw) {
-        final String[] values = getResources().getStringArray(R.array.bearer_entries);
-        final StringBuilder retVal = new StringBuilder();
-        boolean first = true;
-        for (String bearer : raw) {
-            int bearerIndex = mBearerMulti.findIndexOfValue(bearer);
-            try {
-                if (first) {
-                    retVal.append(values[bearerIndex]);
-                    first = false;
-                } else {
-                    retVal.append(", " + values[bearerIndex]);
-                }
-            } catch (ArrayIndexOutOfBoundsException e) {
-                // ignore
-            }
-        }
-        final String val = retVal.toString();
-        if (!TextUtils.isEmpty(val)) {
-            return val;
-        }
-        return null;
-    }
-
-    private String mvnoDescription(String newValue) {
-        final int mvnoIndex = mMvnoType.findIndexOfValue(newValue);
-        final String oldValue = mMvnoType.getValue();
-
-        if (mvnoIndex == -1) {
-            return null;
-        } else {
-            final String[] values = getResources().getStringArray(R.array.mvno_type_entries);
-            final boolean mvnoMatchDataUneditable =
-                    mReadOnlyApn || (mReadOnlyApnFields != null
-                            && Arrays.asList(mReadOnlyApnFields)
-                            .contains(Telephony.Carriers.MVNO_MATCH_DATA));
-            mMvnoMatchData.setEnabled(!mvnoMatchDataUneditable && mvnoIndex != 0);
-            if (newValue != null && !newValue.equals(oldValue)) {
-                if (values[mvnoIndex].equals("SPN")) {
-                    TelephonyManager telephonyManager = (TelephonyManager)
-                            getContext().getSystemService(TelephonyManager.class);
-                    final TelephonyManager telephonyManagerForSubId =
-                            telephonyManager.createForSubscriptionId(mSubId);
-                    if (telephonyManagerForSubId != null) {
-                        telephonyManager = telephonyManagerForSubId;
-                    }
-                    mMvnoMatchData.setText(telephonyManager.getSimOperatorName());
-                } else if (values[mvnoIndex].equals("IMSI")) {
-                    final SubscriptionInfo subInfo =
-                            mProxySubscriptionMgr.getAccessibleSubscriptionInfo(mSubId);
-                    final String mcc = (subInfo == null) ? "" :
-                            Objects.toString(subInfo.getMccString(), "");
-                    final String mnc = (subInfo == null) ? "" :
-                            Objects.toString(subInfo.getMncString(), "");
-                    mMvnoMatchData.setText(mcc + mnc + "x");
-                } else if (values[mvnoIndex].equals("GID")) {
-                    TelephonyManager telephonyManager = (TelephonyManager)
-                            getContext().getSystemService(TelephonyManager.class);
-                    final TelephonyManager telephonyManagerForSubId =
-                            telephonyManager.createForSubscriptionId(mSubId);
-                    if (telephonyManagerForSubId != null) {
-                        telephonyManager = telephonyManagerForSubId;
-                    }
-                    mMvnoMatchData.setText(telephonyManager.getGroupIdLevel1());
-                } else {
-                    // mvno type 'none' case. At this time, mvnoIndex should be 0.
-                    mMvnoMatchData.setText("");
-                }
-            }
-
-            try {
-                return values[mvnoIndex];
-            } catch (ArrayIndexOutOfBoundsException e) {
-                return null;
-            }
-        }
-    }
-    /**
-     * Callback when preference status changed.
-     */
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        String key = preference.getKey();
-        if (KEY_AUTH_TYPE.equals(key)) {
-            try {
-                final int index = Integer.parseInt((String) newValue);
-                mAuthType.setValueIndex(index);
-
-                final String[] values = getResources().getStringArray(R.array.apn_auth_entries);
-                mAuthType.setSummary(values[index]);
-            } catch (NumberFormatException e) {
-                return false;
-            }
-        } else if (KEY_APN_TYPE.equals(key)) {
-            String data = (TextUtils.isEmpty((String) newValue)
-                    && !ArrayUtils.isEmpty(mDefaultApnTypes))
-                    ? getEditableApnType(mDefaultApnTypes) : (String) newValue;
-            if (!TextUtils.isEmpty(data)) {
-                mApnType.setSummary(data);
-            }
-        } else if (KEY_PROTOCOL.equals(key)) {
-            final String protocol = protocolDescription((String) newValue, mProtocol);
-            if (protocol == null) {
-                return false;
-            }
-            mProtocol.setSummary(protocol);
-            mProtocol.setValue((String) newValue);
-        } else if (KEY_ROAMING_PROTOCOL.equals(key)) {
-            final String protocol = protocolDescription((String) newValue, mRoamingProtocol);
-            if (protocol == null) {
-                return false;
-            }
-            mRoamingProtocol.setSummary(protocol);
-            mRoamingProtocol.setValue((String) newValue);
-        } else if (KEY_BEARER_MULTI.equals(key)) {
-            final String bearer = bearerMultiDescription((Set<String>) newValue);
-            if (bearer == null) {
-                return false;
-            }
-            mBearerMulti.setValues((Set<String>) newValue);
-            mBearerMulti.setSummary(bearer);
-        } else if (KEY_MVNO_TYPE.equals(key)) {
-            final String mvno = mvnoDescription((String) newValue);
-            if (mvno == null) {
-                return false;
-            }
-            mMvnoType.setValue((String) newValue);
-            mMvnoType.setSummary(mvno);
-            mMvnoMatchData.setSummary(checkNullforMvnoValue(mMvnoMatchData.getText()));
-        } else if (KEY_PASSWORD.equals(key)) {
-            mPassword.setSummary(starify(newValue != null ? String.valueOf(newValue) : ""));
-        } else if (KEY_CARRIER_ENABLED.equals(key)) {
-            // do nothing
-        } else {
-            preference.setSummary(checkNull(newValue != null ? String.valueOf(newValue) : null));
-        }
-        return true;
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        super.onCreateOptionsMenu(menu, inflater);
-        // If it's a new APN, then cancel will delete the new entry in onPause
-        // If APN add is not allowed, delete might lead to issue regarding recovery
-        if (!mNewApn && !mReadOnlyApn && mIsAddApnAllowed) {
-            menu.add(0, MENU_DELETE, 0, R.string.menu_delete)
-                .setIcon(R.drawable.ic_delete);
-        }
-        if (!mReadOnlyApn) {
-            menu.add(0, MENU_SAVE, 0, R.string.menu_save)
-                .setIcon(android.R.drawable.ic_menu_save);
-        }
-        menu.add(0, MENU_CANCEL, 0, R.string.menu_cancel)
-            .setIcon(android.R.drawable.ic_menu_close_clear_cancel);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case MENU_DELETE:
-                deleteApn();
-                finish();
-                return true;
-            case MENU_SAVE:
-                if (validateAndSaveApnData()) {
-                    finish();
-                }
-                return true;
-            case MENU_CANCEL:
-                finish();
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        view.setOnKeyListener(this);
-        view.setFocusableInTouchMode(true);
-        view.requestFocus();
-    }
-
-    /**
-     * Try to save the apn data when pressed the back button. An error message will be displayed if
-     * the apn data is invalid.
-     *
-     * TODO(b/77339593): Try to keep the same behavior between back button and up navigate button.
-     * We will save the valid apn data to the database when pressed the back button, but discard all
-     * user changed when pressed the up navigate button.
-     */
-    @Override
-    public boolean onKey(View v, int keyCode, KeyEvent event) {
-        if (event.getAction() != KeyEvent.ACTION_DOWN) return false;
-        switch (keyCode) {
-            case KeyEvent.KEYCODE_BACK: {
-                if (validateAndSaveApnData()) {
-                    finish();
-                }
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Add key, value to {@code cv} and compare the value against the value at index in
-     * {@link #mApnData}.
-     *
-     * <p>
-     * The key, value will not add to {@code cv} if value is null.
-     *
-     * @return true if values are different. {@code assumeDiff} indicates if values can be assumed
-     * different in which case no comparison is needed.
-     */
-    boolean setStringValueAndCheckIfDiff(
-            ContentValues cv, String key, String value, boolean assumeDiff, int index) {
-        final String valueFromLocalCache = mApnData.getString(index);
-        if (VDBG) {
-            Log.d(TAG, "setStringValueAndCheckIfDiff: assumeDiff: " + assumeDiff
-                    + " key: " + key
-                    + " value: '" + value
-                    + "' valueFromDb: '" + valueFromLocalCache + "'");
-        }
-        final boolean isDiff = assumeDiff
-                || !((TextUtils.isEmpty(value) && TextUtils.isEmpty(valueFromLocalCache))
-                || (value != null && value.equals(valueFromLocalCache)));
-
-        if (isDiff && value != null) {
-            cv.put(key, value);
-        }
-        return isDiff;
-    }
-
-    /**
-     * Add key, value to {@code cv} and compare the value against the value at index in
-     * {@link #mApnData}.
-     *
-     * @return true if values are different. {@code assumeDiff} indicates if values can be assumed
-     * different in which case no comparison is needed.
-     */
-    boolean setIntValueAndCheckIfDiff(
-            ContentValues cv, String key, int value, boolean assumeDiff, int index) {
-        final Integer valueFromLocalCache = mApnData.getInteger(index);
-        if (VDBG) {
-            Log.d(TAG, "setIntValueAndCheckIfDiff: assumeDiff: " + assumeDiff
-                    + " key: " + key
-                    + " value: '" + value
-                    + "' valueFromDb: '" + valueFromLocalCache + "'");
-        }
-
-        final boolean isDiff = assumeDiff || value != valueFromLocalCache;
-        if (isDiff) {
-            cv.put(key, value);
-        }
-        return isDiff;
-    }
-
-    /**
-     * Validates the apn data and save it to the database if it's valid.
-     *
-     * <p>
-     * A dialog with error message will be displayed if the APN data is invalid.
-     *
-     * @return true if there is no error
-     */
-    @VisibleForTesting
-    boolean validateAndSaveApnData() {
-        // Nothing to do if it's a read only APN
-        if (mReadOnlyApn) {
-            return true;
-        }
-
-        final String name = checkNotSet(mName.getText());
-        final String apn = checkNotSet(mApn.getText());
-        final String mcc = checkNotSet(mMcc.getText());
-        final String mnc = checkNotSet(mMnc.getText());
-
-        final String errorMsg = validateApnData();
-        if (errorMsg != null) {
-            showError();
-            return false;
-        }
-
-        final ContentValues values = new ContentValues();
-        // call update() if it's a new APN. If not, check if any field differs from the db value;
-        // if any diff is found update() should be called
-        boolean callUpdate = mNewApn;
-        callUpdate = setStringValueAndCheckIfDiff(values,
-                Telephony.Carriers.NAME,
-                name,
-                callUpdate,
-                NAME_INDEX);
-
-        callUpdate = setStringValueAndCheckIfDiff(values,
-                Telephony.Carriers.APN,
-                apn,
-                callUpdate,
-                APN_INDEX);
-
-        callUpdate = setStringValueAndCheckIfDiff(values,
-                Telephony.Carriers.PROXY,
-                checkNotSet(mProxy.getText()),
-                callUpdate,
-                PROXY_INDEX);
-
-        callUpdate = setStringValueAndCheckIfDiff(values,
-                Telephony.Carriers.PORT,
-                checkNotSet(mPort.getText()),
-                callUpdate,
-                PORT_INDEX);
-
-        callUpdate = setStringValueAndCheckIfDiff(values,
-                Telephony.Carriers.MMSPROXY,
-                checkNotSet(mMmsProxy.getText()),
-                callUpdate,
-                MMSPROXY_INDEX);
-
-        callUpdate = setStringValueAndCheckIfDiff(values,
-                Telephony.Carriers.MMSPORT,
-                checkNotSet(mMmsPort.getText()),
-                callUpdate,
-                MMSPORT_INDEX);
-
-        callUpdate = setStringValueAndCheckIfDiff(values,
-                Telephony.Carriers.USER,
-                checkNotSet(mUser.getText()),
-                callUpdate,
-                USER_INDEX);
-
-        callUpdate = setStringValueAndCheckIfDiff(values,
-                Telephony.Carriers.SERVER,
-                checkNotSet(mServer.getText()),
-                callUpdate,
-                SERVER_INDEX);
-
-        callUpdate = setStringValueAndCheckIfDiff(values,
-                Telephony.Carriers.PASSWORD,
-                checkNotSet(mPassword.getText()),
-                callUpdate,
-                PASSWORD_INDEX);
-
-        callUpdate = setStringValueAndCheckIfDiff(values,
-                Telephony.Carriers.MMSC,
-                checkNotSet(mMmsc.getText()),
-                callUpdate,
-                MMSC_INDEX);
-
-        final String authVal = mAuthType.getValue();
-        if (authVal != null) {
-            callUpdate = setIntValueAndCheckIfDiff(values,
-                    Telephony.Carriers.AUTH_TYPE,
-                    Integer.parseInt(authVal),
-                    callUpdate,
-                    AUTH_TYPE_INDEX);
-        }
-
-        callUpdate = setStringValueAndCheckIfDiff(values,
-                Telephony.Carriers.PROTOCOL,
-                checkNotSet(mProtocol.getValue()),
-                callUpdate,
-                PROTOCOL_INDEX);
-
-        callUpdate = setStringValueAndCheckIfDiff(values,
-                Telephony.Carriers.ROAMING_PROTOCOL,
-                checkNotSet(mRoamingProtocol.getValue()),
-                callUpdate,
-                ROAMING_PROTOCOL_INDEX);
-
-        callUpdate = setStringValueAndCheckIfDiff(values,
-                Telephony.Carriers.TYPE,
-                checkNotSet(getUserEnteredApnType()),
-                callUpdate,
-                TYPE_INDEX);
-
-        callUpdate = setStringValueAndCheckIfDiff(values,
-                Telephony.Carriers.MCC,
-                mcc,
-                callUpdate,
-                MCC_INDEX);
-
-        callUpdate = setStringValueAndCheckIfDiff(values,
-                Telephony.Carriers.MNC,
-                mnc,
-                callUpdate,
-                MNC_INDEX);
-
-        values.put(Telephony.Carriers.NUMERIC, mcc + mnc);
-
-        if (mCurMnc != null && mCurMcc != null) {
-            if (mCurMnc.equals(mnc) && mCurMcc.equals(mcc)) {
-                values.put(Telephony.Carriers.CURRENT, 1);
-            }
-        }
-
-        final Set<String> bearerSet = mBearerMulti.getValues();
-        int bearerBitmask = 0;
-        for (String bearer : bearerSet) {
-            if (Integer.parseInt(bearer) == 0) {
-                bearerBitmask = 0;
-                break;
-            } else {
-                bearerBitmask |= getBitmaskForTech(Integer.parseInt(bearer));
-            }
-        }
-        callUpdate = setIntValueAndCheckIfDiff(values,
-                Telephony.Carriers.BEARER_BITMASK,
-                bearerBitmask,
-                callUpdate,
-                BEARER_BITMASK_INDEX);
-
-        int bearerVal;
-        if (bearerBitmask == 0 || mBearerInitialVal == 0) {
-            bearerVal = 0;
-        } else if (bitmaskHasTech(bearerBitmask, mBearerInitialVal)) {
-            bearerVal = mBearerInitialVal;
-        } else {
-            // bearer field was being used but bitmask has changed now and does not include the
-            // initial bearer value -- setting bearer to 0 but maybe better behavior is to choose a
-            // random tech from the new bitmask??
-            bearerVal = 0;
-        }
-        callUpdate = setIntValueAndCheckIfDiff(values,
-                Telephony.Carriers.BEARER,
-                bearerVal,
-                callUpdate,
-                BEARER_INDEX);
-
-        callUpdate = setStringValueAndCheckIfDiff(values,
-                Telephony.Carriers.MVNO_TYPE,
-                checkNotSet(mMvnoType.getValue()),
-                callUpdate,
-                MVNO_TYPE_INDEX);
-
-        callUpdate = setStringValueAndCheckIfDiff(values,
-                Telephony.Carriers.MVNO_MATCH_DATA,
-                checkNotSet(mMvnoMatchData.getText()),
-                callUpdate,
-                MVNO_MATCH_DATA_INDEX);
-
-        callUpdate = setIntValueAndCheckIfDiff(values,
-                Telephony.Carriers.CARRIER_ENABLED,
-                mCarrierEnabled.isChecked() ? 1 : 0,
-                callUpdate,
-                CARRIER_ENABLED_INDEX);
-
-        values.put(Telephony.Carriers.EDITED_STATUS, Telephony.Carriers.USER_EDITED);
-
-        if (callUpdate) {
-            final Uri uri = mApnData.getUri() == null ? mCarrierUri : mApnData.getUri();
-            updateApnDataToDatabase(uri, values);
-        } else {
-            if (VDBG) Log.d(TAG, "validateAndSaveApnData: not calling update()");
-        }
-
-        return true;
-    }
-
-    private void updateApnDataToDatabase(Uri uri, ContentValues values) {
-        ThreadUtils.postOnBackgroundThread(() -> {
-            if (uri.equals(mCarrierUri)) {
-                // Add a new apn to the database
-                final Uri newUri = getContentResolver().insert(mCarrierUri, values);
-                if (newUri == null) {
-                    Log.e(TAG, "Can't add a new apn to database " + mCarrierUri);
-                }
-            } else {
-                // Update the existing apn
-                getContentResolver().update(
-                        uri, values, null /* where */, null /* selection Args */);
-            }
-        });
-    }
-
-    /**
-     * Validates whether the apn data is valid.
-     *
-     * @return An error message if the apn data is invalid, otherwise return null.
-     */
-    @VisibleForTesting
-    String validateApnData() {
-        String errorMsg = null;
-
-        final String name = checkNotSet(mName.getText());
-        final String apn = checkNotSet(mApn.getText());
-        final String mcc = checkNotSet(mMcc.getText());
-        final String mnc = checkNotSet(mMnc.getText());
-        boolean doNotCheckMccMnc = mIsCarrierIdApn && TextUtils.isEmpty(mcc)
-                && TextUtils.isEmpty(mnc);
-        if (TextUtils.isEmpty(name)) {
-            errorMsg = getResources().getString(R.string.error_name_empty);
-        } else if (TextUtils.isEmpty(apn)) {
-            errorMsg = getResources().getString(R.string.error_apn_empty);
-        } else if (doNotCheckMccMnc) {
-            Log.d(TAG, "validateApnData: carrier id APN does not have mcc/mnc defined");
-            // no op, skip mcc mnc null check
-        } else if (mcc == null || mcc.length() != 3) {
-            errorMsg = getResources().getString(R.string.error_mcc_not3);
-        } else if ((mnc == null || (mnc.length() & 0xFFFE) != 2)) {
-            errorMsg = getResources().getString(R.string.error_mnc_not23);
-        }
-
-        if (errorMsg == null) {
-            // if carrier does not allow editing certain apn types, make sure type does not include
-            // those
-            if (!ArrayUtils.isEmpty(mReadOnlyApnTypes)
-                    && apnTypesMatch(mReadOnlyApnTypes, getUserEnteredApnType())) {
-                final StringBuilder stringBuilder = new StringBuilder();
-                for (String type : mReadOnlyApnTypes) {
-                    stringBuilder.append(type).append(", ");
-                    Log.d(TAG, "validateApnData: appending type: " + type);
-                }
-                // remove last ", "
-                if (stringBuilder.length() >= 2) {
-                    stringBuilder.delete(stringBuilder.length() - 2, stringBuilder.length());
-                }
-                errorMsg = String.format(getResources().getString(R.string.error_adding_apn_type),
-                        stringBuilder);
-            }
-        }
-
-        return errorMsg;
-    }
-
-    @VisibleForTesting
-    void showError() {
-        ErrorDialog.showError(this);
-    }
-
-    private void deleteApn() {
-        if (mApnData.getUri() != null) {
-            getContentResolver().delete(mApnData.getUri(), null, null);
-            mApnData = new ApnData(sProjection.length);
-        }
-    }
-
-    private String starify(String value) {
-        if (value == null || value.length() == 0) {
-            return sNotSet;
-        } else {
-            final char[] password = new char[value.length()];
-            for (int i = 0; i < password.length; i++) {
-                password[i] = '*';
-            }
-            return new String(password);
-        }
-    }
-
-    /**
-     * Returns {@link #sNotSet} if the given string {@code value} is null or empty. The string
-     * {@link #sNotSet} typically used as the default display when an entry in the preference is
-     * null or empty.
-     */
-    private String checkNull(String value) {
-        return TextUtils.isEmpty(value) ? sNotSet : value;
-    }
-
-    /**
-     * To make traslation be diversity, use another string id for MVNO value.
-     */
-    private String checkNullforMvnoValue(String value) {
-        String notSetForMvnoValue = getResources().getString(R.string.apn_not_set_for_mvno);
-        return TextUtils.isEmpty(value) ? notSetForMvnoValue : value;
-    }
-
-    /**
-     * Returns null if the given string {@code value} equals to {@link #sNotSet}. This method
-     * should be used when convert a string value from preference to database.
-     */
-    private String checkNotSet(String value) {
-        return sNotSet.equals(value) ? null : value;
-    }
-
-    @VisibleForTesting
-    String getUserEnteredApnType() {
-        // if user has not specified a type, map it to "ALL APN TYPES THAT ARE NOT READ-ONLY"
-        // but if user enter empty type, map it just for default
-        String userEnteredApnType = mApnType.getText();
-        if (userEnteredApnType != null) userEnteredApnType = userEnteredApnType.trim();
-        if ((TextUtils.isEmpty(userEnteredApnType)
-                || APN_TYPE_ALL.equals(userEnteredApnType))) {
-            userEnteredApnType = getEditableApnType(APN_TYPES);
-        }
-        Log.d(TAG, "getUserEnteredApnType: changed apn type to editable apn types: "
-                + userEnteredApnType);
-        return userEnteredApnType;
-    }
-
-    private String getEditableApnType(String[] apnTypeList) {
-        final StringBuilder editableApnTypes = new StringBuilder();
-        final List<String> readOnlyApnTypes = Arrays.asList(mReadOnlyApnTypes);
-        boolean first = true;
-        for (String apnType : apnTypeList) {
-            // add APN type if it is not read-only and is not wild-cardable
-            if (!readOnlyApnTypes.contains(apnType)
-                    && !apnType.equals(APN_TYPE_IA)
-                    && !apnType.equals(APN_TYPE_EMERGENCY)
-                    && !apnType.equals(APN_TYPE_MCX)
-                    && !apnType.equals(APN_TYPE_IMS)) {
-                if (first) {
-                    first = false;
-                } else {
-                    editableApnTypes.append(",");
-                }
-                editableApnTypes.append(apnType);
-            }
-        }
-        return editableApnTypes.toString();
-    }
-
-    private void initApnEditorUi() {
-        addPreferencesFromResource(R.xml.apn_editor);
-
-        sNotSet = getResources().getString(R.string.apn_not_set);
-        mName = (EditTextPreference) findPreference("apn_name");
-        mApn = (EditTextPreference) findPreference("apn_apn");
-        mProxy = (EditTextPreference) findPreference("apn_http_proxy");
-        mPort = (EditTextPreference) findPreference("apn_http_port");
-        mUser = (EditTextPreference) findPreference("apn_user");
-        mServer = (EditTextPreference) findPreference("apn_server");
-        mPassword = (EditTextPreference) findPreference(KEY_PASSWORD);
-        mMmsProxy = (EditTextPreference) findPreference("apn_mms_proxy");
-        mMmsPort = (EditTextPreference) findPreference("apn_mms_port");
-        mMmsc = (EditTextPreference) findPreference("apn_mmsc");
-        mMcc = (EditTextPreference) findPreference("apn_mcc");
-        mMnc = (EditTextPreference) findPreference("apn_mnc");
-        mApnType = (EditTextPreference) findPreference("apn_type");
-        mAuthType = (ListPreference) findPreference(KEY_AUTH_TYPE);
-        mProtocol = (ListPreference) findPreference(KEY_PROTOCOL);
-        mRoamingProtocol = (ListPreference) findPreference(KEY_ROAMING_PROTOCOL);
-        mCarrierEnabled = (TwoStatePreference) findPreference(KEY_CARRIER_ENABLED);
-        mBearerMulti = (MultiSelectListPreference) findPreference(KEY_BEARER_MULTI);
-        mMvnoType = (ListPreference) findPreference(KEY_MVNO_TYPE);
-        mMvnoMatchData = (EditTextPreference) findPreference("mvno_match_data");
-    }
-
-    @VisibleForTesting
-    protected void getCarrierCustomizedConfig(Context context) {
-        mReadOnlyApn = false;
-        mReadOnlyApnTypes = null;
-        mReadOnlyApnFields = null;
-        mIsAddApnAllowed = true;
-
-        final CarrierConfigManager configManager = (CarrierConfigManager)
-            context.getSystemService(Context.CARRIER_CONFIG_SERVICE);
-        if (configManager != null) {
-            final PersistableBundle b = configManager.getConfigForSubId(mSubId);
-            if (b != null) {
-                mReadOnlyApnTypes = getReadOnlyApnTypes(b);
-                if (!ArrayUtils.isEmpty(mReadOnlyApnTypes)) {
-                    Log.d(TAG,
-                            "onCreate: read only APN type: " + Arrays.toString(mReadOnlyApnTypes));
-                }
-                mReadOnlyApnFields = b.getStringArray(
-                        CarrierConfigManager.KEY_READ_ONLY_APN_FIELDS_STRING_ARRAY);
-
-                mDefaultApnTypes = b.getStringArray(
-                        CarrierConfigManager.KEY_APN_SETTINGS_DEFAULT_APN_TYPES_STRING_ARRAY);
-
-                if (!ArrayUtils.isEmpty(mDefaultApnTypes)) {
-                    Log.d(TAG, "onCreate: default apn types: " + Arrays.toString(mDefaultApnTypes));
-                }
-
-                mDefaultApnProtocol = b.getString(
-                        CarrierConfigManager.Apn.KEY_SETTINGS_DEFAULT_PROTOCOL_STRING);
-                if (!TextUtils.isEmpty(mDefaultApnProtocol)) {
-                    Log.d(TAG, "onCreate: default apn protocol: " + mDefaultApnProtocol);
-                }
-
-                mDefaultApnRoamingProtocol = b.getString(
-                        CarrierConfigManager.Apn.KEY_SETTINGS_DEFAULT_ROAMING_PROTOCOL_STRING);
-                if (!TextUtils.isEmpty(mDefaultApnRoamingProtocol)) {
-                    Log.d(TAG, "onCreate: default apn roaming protocol: "
-                            + mDefaultApnRoamingProtocol);
-                }
-
-                mIsAddApnAllowed = b.getBoolean(CarrierConfigManager.KEY_ALLOW_ADDING_APNS_BOOL);
-                if (!mIsAddApnAllowed) {
-                    Log.d(TAG, "onCreate: not allow to add new APN");
-                }
-            }
-        }
-    }
-
-    private void setCarrierCustomizedConfigToUi() {
-        if (TextUtils.isEmpty(mApnType.getText()) && !ArrayUtils.isEmpty(mDefaultApnTypes)) {
-            String value = getEditableApnType(mDefaultApnTypes);
-            mApnType.setText(value);
-            mApnType.setSummary(value);
-        }
-
-        String protocol = protocolDescription(mDefaultApnProtocol, mProtocol);
-        if (TextUtils.isEmpty(mProtocol.getValue()) && !TextUtils.isEmpty(protocol)) {
-            mProtocol.setValue(mDefaultApnProtocol);
-            mProtocol.setSummary(protocol);
-        }
-
-        String roamingProtocol = protocolDescription(mDefaultApnRoamingProtocol, mRoamingProtocol);
-        if (TextUtils.isEmpty(mRoamingProtocol.getValue()) && !TextUtils.isEmpty(roamingProtocol)) {
-            mRoamingProtocol.setValue(mDefaultApnRoamingProtocol);
-            mRoamingProtocol.setSummary(roamingProtocol);
-        }
-    }
-
-    /**
-     * Dialog of error message.
-     */
-    public static class ErrorDialog extends InstrumentedDialogFragment {
-        /**
-         * Show error dialog.
-         */
-        public static void showError(ApnEditor editor) {
-            final ErrorDialog dialog = new ErrorDialog();
-            dialog.setTargetFragment(editor, 0);
-            dialog.show(editor.getFragmentManager(), "error");
-        }
-
-        @Override
-        public Dialog onCreateDialog(Bundle savedInstanceState) {
-            final String msg = ((ApnEditor) getTargetFragment()).validateApnData();
-
-            return new AlertDialog.Builder(getContext())
-                    .setTitle(R.string.error_title)
-                    .setPositiveButton(android.R.string.ok, null)
-                    .setMessage(msg)
-                    .create();
-        }
-
-        @Override
-        public int getMetricsCategory() {
-            return SettingsEnums.DIALOG_APN_EDITOR_ERROR;
-        }
-    }
-
-    @VisibleForTesting
-    ApnData getApnDataFromUri(Uri uri) {
-        ApnData apnData = null;
-        try (Cursor cursor = getContentResolver().query(
-                uri,
-                sProjection,
-                null /* selection */,
-                null /* selectionArgs */,
-                null /* sortOrder */)) {
-            if (cursor != null && cursor.moveToFirst()) {
-                apnData = new ApnData(uri, cursor);
-            }
-        }
-
-        if (apnData == null) {
-            Log.d(TAG, "Can't get apnData from Uri " + uri);
-        }
-
-        return apnData;
-    }
-
-    @VisibleForTesting
     boolean isUserRestricted() {
         UserManager userManager = getContext().getSystemService(UserManager.class);
         if (userManager == null) {
@@ -1502,80 +201,4 @@
         }
         return false;
     }
-
-    @VisibleForTesting
-    static class ApnData {
-        /**
-         * The uri correspond to a database row of the apn data. This should be null if the apn
-         * is not in the database.
-         */
-        Uri mUri;
-
-        /** Each element correspond to a column of the database row. */
-        Object[] mData;
-
-        ApnData(int numberOfField) {
-            mData = new Object[numberOfField];
-        }
-
-        ApnData(Uri uri, Cursor cursor) {
-            mUri = uri;
-            mData = new Object[cursor.getColumnCount()];
-            for (int i = 0; i < mData.length; i++) {
-                switch (cursor.getType(i)) {
-                    case Cursor.FIELD_TYPE_FLOAT:
-                        mData[i] = cursor.getFloat(i);
-                        break;
-                    case Cursor.FIELD_TYPE_INTEGER:
-                        mData[i] = cursor.getInt(i);
-                        break;
-                    case Cursor.FIELD_TYPE_STRING:
-                        mData[i] = cursor.getString(i);
-                        break;
-                    case Cursor.FIELD_TYPE_BLOB:
-                        mData[i] = cursor.getBlob(i);
-                        break;
-                    default:
-                        mData[i] = null;
-                }
-            }
-        }
-
-        Uri getUri() {
-            return mUri;
-        }
-
-        void setUri(Uri uri) {
-            mUri = uri;
-        }
-
-        Integer getInteger(int index) {
-            return (Integer) mData[index];
-        }
-
-        Integer getInteger(int index, Integer defaultValue) {
-            final Integer val = getInteger(index);
-            return val == null ? defaultValue : val;
-        }
-
-        String getString(int index) {
-            return (String) mData[index];
-        }
-    }
-
-    private static int getBitmaskForTech(int radioTech) {
-        if (radioTech >= 1) {
-            return (1 << (radioTech - 1));
-        }
-        return 0;
-    }
-
-    private static boolean bitmaskHasTech(int bearerBitmask, int radioTech) {
-        if (bearerBitmask == 0) {
-            return true;
-        } else if (radioTech >= 1) {
-            return ((bearerBitmask & (1 << (radioTech - 1))) != 0);
-        }
-        return false;
-    }
 }
diff --git a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
index 7d5230d..c428f98 100644
--- a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
+++ b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
@@ -26,6 +26,7 @@
 import android.content.res.Resources;
 import android.os.PersistableBundle;
 import android.telephony.CarrierConfigManager;
+import android.telephony.RadioAccessFamily;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyCallback;
@@ -445,7 +446,7 @@
         }
 
         private int getPreferredNetworkMode() {
-            int networkMode = MobileNetworkUtils.getNetworkTypeFromRaf(
+            int networkMode = RadioAccessFamily.getNetworkTypeFromRaf(
                     (int) mTelephonyManager.getAllowedNetworkTypesForReason(
                             TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER));
             if (!showNrList()) {
diff --git a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerHelper.kt b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerHelper.kt
index d297e1c..9af6437 100644
--- a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerHelper.kt
+++ b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerHelper.kt
@@ -18,6 +18,7 @@
 
 import android.content.Context
 import android.telephony.CarrierConfigManager
+import android.telephony.RadioAccessFamily
 import android.telephony.SubscriptionManager
 import android.telephony.TelephonyManager
 import androidx.lifecycle.LifecycleOwner
@@ -35,7 +36,7 @@
     viewLifecycleOwner.lifecycleScope.launch(Dispatchers.Default) {
         setAllowedNetworkTypesForReason(
             TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER,
-            MobileNetworkUtils.getRafFromNetworkType(newPreferredNetworkMode),
+            RadioAccessFamily.getRafFromNetworkType(newPreferredNetworkMode).toLong(),
         )
     }
 }
diff --git a/src/com/android/settings/network/telephony/MobileNetworkUtils.java b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
index 82083b5..341f7a1b 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkUtils.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
@@ -18,14 +18,6 @@
 
 import static android.provider.Telephony.Carriers.ENFORCE_MANAGED_URI;
 
-import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.CDMA;
-import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.EVDO;
-import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.GSM;
-import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.LTE;
-import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.NR;
-import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.RAF_TD_SCDMA;
-import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.RAF_UNKNOWN;
-import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.WCDMA;
 import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO;
 import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA;
 import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO;
@@ -56,11 +48,11 @@
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
 import android.telephony.CarrierConfigManager;
+import android.telephony.RadioAccessFamily;
 import android.telephony.ServiceState;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
-import android.telephony.euicc.EuiccManager;
 import android.telephony.ims.ImsManager;
 import android.telephony.ims.ImsRcsManager;
 import android.telephony.ims.ProvisioningManager;
@@ -89,9 +81,7 @@
 import com.android.settingslib.graph.SignalDrawable;
 import com.android.settingslib.mobile.dataservice.SubscriptionInfoEntity;
 
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 public class MobileNetworkUtils {
 
@@ -334,7 +324,7 @@
         }
 
         if (isWorldMode(context, subId)) {
-            final int settingsNetworkMode = getNetworkTypeFromRaf(
+            final int settingsNetworkMode = RadioAccessFamily.getNetworkTypeFromRaf(
                     (int) telephonyManager.getAllowedNetworkTypesForReason(
                             TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER));
 
@@ -365,7 +355,7 @@
         }
         final TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class)
                 .createForSubscriptionId(subId);
-        final int networkMode = getNetworkTypeFromRaf(
+        final int networkMode = RadioAccessFamily.getNetworkTypeFromRaf(
                 (int) telephonyManager.getAllowedNetworkTypesForReason(
                         TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER));
         if (isWorldMode(context, subId)) {
@@ -433,7 +423,7 @@
         }
 
         if (isWorldMode(context, subId)) {
-            final int networkMode = getNetworkTypeFromRaf(
+            final int networkMode = RadioAccessFamily.getNetworkTypeFromRaf(
                     (int) telephonyManager.getAllowedNetworkTypesForReason(
                             TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER));
             if (networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO) {
@@ -548,7 +538,7 @@
         }
         final TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class)
                 .createForSubscriptionId(subId);
-        final int networkMode = getNetworkTypeFromRaf(
+        final int networkMode = RadioAccessFamily.getNetworkTypeFromRaf(
                 (int) telephonyManager.getAllowedNetworkTypesForReason(
                         TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER));
         if (networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM
@@ -648,197 +638,6 @@
     }
 
     /**
-     * Loop through all the device logical slots to check whether the user's current country
-     * supports eSIM.
-     */
-    private static boolean isCurrentCountrySupported(Context context) {
-        final EuiccManager em = (EuiccManager) context.getSystemService(EuiccManager.class);
-        final TelephonyManager tm =
-                (TelephonyManager) context.getSystemService(TelephonyManager.class);
-
-        Set<String> countrySet = new HashSet<>();
-        for (int i = 0; i < tm.getPhoneCount(); i++) {
-            String countryCode = tm.getNetworkCountryIso(i);
-            if (!TextUtils.isEmpty(countryCode)) {
-                countrySet.add(countryCode);
-            }
-        }
-        boolean isSupported = countrySet.stream().anyMatch(em::isSupportedCountry);
-        Log.i(TAG, "isCurrentCountrySupported countryCodes: " + countrySet
-                + " eSIMSupported: " + isSupported);
-        return isSupported;
-    }
-
-    /**
-     *  Imported from {@link android.telephony.RadioAccessFamily}
-     */
-    public static long getRafFromNetworkType(int type) {
-        switch (type) {
-            case TelephonyManagerConstants.NETWORK_MODE_WCDMA_PREF:
-                return GSM | WCDMA;
-            case TelephonyManagerConstants.NETWORK_MODE_GSM_ONLY:
-                return GSM;
-            case TelephonyManagerConstants.NETWORK_MODE_WCDMA_ONLY:
-                return WCDMA;
-            case TelephonyManagerConstants.NETWORK_MODE_GSM_UMTS:
-                return GSM | WCDMA;
-            case TelephonyManagerConstants.NETWORK_MODE_CDMA_EVDO:
-                return CDMA | EVDO;
-            case TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO:
-                return LTE | CDMA | EVDO;
-            case TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA:
-                return LTE | GSM | WCDMA;
-            case TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
-                return LTE | CDMA | EVDO | GSM | WCDMA;
-            case TelephonyManagerConstants.NETWORK_MODE_LTE_ONLY:
-                return LTE;
-            case TelephonyManagerConstants.NETWORK_MODE_LTE_WCDMA:
-                return LTE | WCDMA;
-            case TelephonyManagerConstants.NETWORK_MODE_CDMA_NO_EVDO:
-                return CDMA;
-            case TelephonyManagerConstants.NETWORK_MODE_EVDO_NO_CDMA:
-                return EVDO;
-            case TelephonyManagerConstants.NETWORK_MODE_GLOBAL:
-                return GSM | WCDMA | CDMA | EVDO;
-            case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_ONLY:
-                return RAF_TD_SCDMA;
-            case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_WCDMA:
-                return RAF_TD_SCDMA | WCDMA;
-            case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA:
-                return LTE | RAF_TD_SCDMA;
-            case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM:
-                return RAF_TD_SCDMA | GSM;
-            case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM:
-                return LTE | RAF_TD_SCDMA | GSM;
-            case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA:
-                return RAF_TD_SCDMA | GSM | WCDMA;
-            case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_WCDMA:
-                return LTE | RAF_TD_SCDMA | WCDMA;
-            case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA:
-                return LTE | RAF_TD_SCDMA | GSM | WCDMA;
-            case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
-                return RAF_TD_SCDMA | CDMA | EVDO | GSM | WCDMA;
-            case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
-                return LTE | RAF_TD_SCDMA | CDMA | EVDO | GSM | WCDMA;
-            case (TelephonyManagerConstants.NETWORK_MODE_NR_ONLY):
-                return NR;
-            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE):
-                return NR | LTE;
-            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO):
-                return NR | LTE | CDMA | EVDO;
-            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA):
-                return NR | LTE | GSM | WCDMA;
-            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA):
-                return NR | LTE | CDMA | EVDO | GSM | WCDMA;
-            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_WCDMA):
-                return NR | LTE | WCDMA;
-            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA):
-                return NR | LTE | RAF_TD_SCDMA;
-            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM):
-                return NR | LTE | RAF_TD_SCDMA | GSM;
-            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_WCDMA):
-                return NR | LTE | RAF_TD_SCDMA | WCDMA;
-            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA):
-                return NR | LTE | RAF_TD_SCDMA | GSM | WCDMA;
-            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA):
-                return NR | LTE | RAF_TD_SCDMA | CDMA | EVDO | GSM | WCDMA;
-            default:
-                return RAF_UNKNOWN;
-        }
-    }
-
-    /**
-     *  Imported from {@link android.telephony.RadioAccessFamily}
-     */
-    public static int getNetworkTypeFromRaf(int raf) {
-        raf = getAdjustedRaf(raf);
-
-        switch (raf) {
-            case (GSM | WCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_WCDMA_PREF;
-            case GSM:
-                return TelephonyManagerConstants.NETWORK_MODE_GSM_ONLY;
-            case WCDMA:
-                return TelephonyManagerConstants.NETWORK_MODE_WCDMA_ONLY;
-            case (CDMA | EVDO):
-                return TelephonyManagerConstants.NETWORK_MODE_CDMA_EVDO;
-            case (LTE | CDMA | EVDO):
-                return TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO;
-            case (LTE | GSM | WCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA;
-            case (LTE | CDMA | EVDO | GSM | WCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA;
-            case LTE:
-                return TelephonyManagerConstants.NETWORK_MODE_LTE_ONLY;
-            case (LTE | WCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_LTE_WCDMA;
-            case CDMA:
-                return TelephonyManagerConstants.NETWORK_MODE_CDMA_NO_EVDO;
-            case EVDO:
-                return TelephonyManagerConstants.NETWORK_MODE_EVDO_NO_CDMA;
-            case (GSM | WCDMA | CDMA | EVDO):
-                return TelephonyManagerConstants.NETWORK_MODE_GLOBAL;
-            case RAF_TD_SCDMA:
-                return TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_ONLY;
-            case (RAF_TD_SCDMA | WCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_WCDMA;
-            case (LTE | RAF_TD_SCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA;
-            case (RAF_TD_SCDMA | GSM):
-                return TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM;
-            case (LTE | RAF_TD_SCDMA | GSM):
-                return TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM;
-            case (RAF_TD_SCDMA | GSM | WCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA;
-            case (LTE | RAF_TD_SCDMA | WCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_WCDMA;
-            case (LTE | RAF_TD_SCDMA | GSM | WCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA;
-            case (RAF_TD_SCDMA | CDMA | EVDO | GSM | WCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA;
-            case (LTE | RAF_TD_SCDMA | CDMA | EVDO | GSM | WCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA;
-            case (NR):
-                return TelephonyManagerConstants.NETWORK_MODE_NR_ONLY;
-            case (NR | LTE):
-                return TelephonyManagerConstants.NETWORK_MODE_NR_LTE;
-            case (NR | LTE | CDMA | EVDO):
-                return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO;
-            case (NR | LTE | GSM | WCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA;
-            case (NR | LTE | CDMA | EVDO | GSM | WCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA;
-            case (NR | LTE | WCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_WCDMA;
-            case (NR | LTE | RAF_TD_SCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA;
-            case (NR | LTE | RAF_TD_SCDMA | GSM):
-                return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM;
-            case (NR | LTE | RAF_TD_SCDMA | WCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_WCDMA;
-            case (NR | LTE | RAF_TD_SCDMA | GSM | WCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA;
-            case (NR | LTE | RAF_TD_SCDMA | CDMA | EVDO | GSM | WCDMA):
-                return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA;
-            default:
-                return TelephonyManagerConstants.NETWORK_MODE_UNKNOWN;
-        }
-    }
-
-    /**
-     *  Imported from {@link android.telephony.RadioAccessFamily}
-     */
-    private static int getAdjustedRaf(int raf) {
-        raf = ((GSM & raf) > 0) ? (GSM | raf) : raf;
-        raf = ((WCDMA & raf) > 0) ? (WCDMA | raf) : raf;
-        raf = ((CDMA & raf) > 0) ? (CDMA | raf) : raf;
-        raf = ((EVDO & raf) > 0) ? (EVDO | raf) : raf;
-        raf = ((LTE & raf) > 0) ? (LTE | raf) : raf;
-        raf = ((NR & raf) > 0) ? (NR | raf) : raf;
-        return raf;
-    }
-
-    /**
      * Copied from SubscriptionsPreferenceController#activeNetworkIsCellular()
      */
     public static boolean activeNetworkIsCellular(Context context) {
diff --git a/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
index 210cd87..2d567af 100644
--- a/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
+++ b/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
@@ -21,6 +21,7 @@
 import android.content.Context;
 import android.os.PersistableBundle;
 import android.telephony.CarrierConfigManager;
+import android.telephony.RadioAccessFamily;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.util.Log;
@@ -72,7 +73,7 @@
 
         mTelephonyManager.setAllowedNetworkTypesForReason(
                 TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER,
-                MobileNetworkUtils.getRafFromNetworkType(newPreferredNetworkMode));
+                RadioAccessFamily.getRafFromNetworkType(newPreferredNetworkMode));
 
             final ListPreference listPreference = (ListPreference) preference;
             listPreference.setSummary(getPreferredNetworkModeSummaryResId(newPreferredNetworkMode));
@@ -94,7 +95,7 @@
             Log.w(TAG, "TelephonyManager is null");
             return TelephonyManagerConstants.NETWORK_MODE_UNKNOWN;
         }
-        return MobileNetworkUtils.getNetworkTypeFromRaf(
+        return RadioAccessFamily.getNetworkTypeFromRaf(
                 (int) mTelephonyManager.getAllowedNetworkTypesForReason(
                         TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER));
     }
diff --git a/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java b/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java
index 4f4c35d..fe702e4 100644
--- a/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java
+++ b/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java
@@ -22,14 +22,13 @@
 
 import android.content.Context;
 import android.provider.Settings;
+import android.telephony.RadioAccessFamily;
 import android.telephony.TelephonyManager;
 import android.util.Log;
 
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 
-import com.android.settings.network.telephony.MobileNetworkUtils;
-
 /**
  * Preference controller for "System Select"
  */
@@ -65,7 +64,7 @@
             }
 
             final int settingsNetworkMode =
-                    hasTelephonyMgr ? MobileNetworkUtils.getNetworkTypeFromRaf(
+                    hasTelephonyMgr ? RadioAccessFamily.getNetworkTypeFromRaf(
                             (int) mTelephonyManager.getAllowedNetworkTypesForReason(
                                     TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER))
                             : NETWORK_MODE_UNKNOWN;
diff --git a/src/com/android/settings/notification/DialPadTonePreference.kt b/src/com/android/settings/notification/DialPadTonePreference.kt
new file mode 100644
index 0000000..32bc42e
--- /dev/null
+++ b/src/com/android/settings/notification/DialPadTonePreference.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2024 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
+
+import android.content.Context
+import android.provider.Settings.System.DTMF_TONE_WHEN_DIALING
+import com.android.settings.R
+import com.android.settings.Utils
+import com.android.settingslib.datastore.SettingsSystemStore
+import com.android.settingslib.metadata.PreferenceAvailabilityProvider
+import com.android.settingslib.metadata.SwitchPreference
+
+// LINT.IfChange
+class DialPadTonePreference :
+    SwitchPreference(DTMF_TONE_WHEN_DIALING, R.string.dial_pad_tones_title),
+    PreferenceAvailabilityProvider {
+
+    override fun storage(context: Context) = SettingsSystemStore.get(context)
+
+    override fun isAvailable(context: Context) = Utils.isVoiceCapable(context)
+}
+// LINT.ThenChange(DialPadTonePreferenceController.java)
diff --git a/src/com/android/settings/notification/DialPadTonePreferenceController.java b/src/com/android/settings/notification/DialPadTonePreferenceController.java
index 1b05ce2..bfbf120 100644
--- a/src/com/android/settings/notification/DialPadTonePreferenceController.java
+++ b/src/com/android/settings/notification/DialPadTonePreferenceController.java
@@ -16,24 +16,24 @@
 
 package com.android.settings.notification;
 
+import static android.provider.Settings.System.DTMF_TONE_WHEN_DIALING;
+
 import static com.android.settings.notification.SettingPref.TYPE_SYSTEM;
 
 import android.content.Context;
-import android.provider.Settings.System;
 
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
+// LINT.IfChange
 public class DialPadTonePreferenceController extends SettingPrefController {
 
-    private static final String KEY_DIAL_PAD_TONES = "dial_pad_tones";
-
     public DialPadTonePreferenceController(Context context, SettingsPreferenceFragment parent,
             Lifecycle lifecycle) {
         super(context, parent, lifecycle);
-        mPreference = new SettingPref(
-            TYPE_SYSTEM, KEY_DIAL_PAD_TONES, System.DTMF_TONE_WHEN_DIALING, DEFAULT_ON) {
+        mPreference = new SettingPref(TYPE_SYSTEM, DTMF_TONE_WHEN_DIALING, DTMF_TONE_WHEN_DIALING,
+                DEFAULT_ON) {
             @Override
             public boolean isApplicable(Context context) {
                 return Utils.isVoiceCapable(context);
@@ -42,3 +42,4 @@
     }
 
 }
+// LINT.ThenChange(DialPadTonePreference.kt)
diff --git a/src/com/android/settings/notification/SoundScreen.kt b/src/com/android/settings/notification/SoundScreen.kt
index f1f2749..6b60967 100644
--- a/src/com/android/settings/notification/SoundScreen.kt
+++ b/src/com/android/settings/notification/SoundScreen.kt
@@ -19,12 +19,13 @@
 import androidx.fragment.app.Fragment
 import com.android.settings.R
 import com.android.settings.flags.Flags
+import com.android.settingslib.metadata.PreferenceIconProvider
 import com.android.settingslib.metadata.ProvidePreferenceScreen
 import com.android.settingslib.metadata.preferenceHierarchy
 import com.android.settingslib.preference.PreferenceScreenCreator
 
 @ProvidePreferenceScreen
-class SoundScreen : PreferenceScreenCreator {
+class SoundScreen : PreferenceScreenCreator, PreferenceIconProvider {
     override val key: String
         get() = KEY
 
@@ -34,13 +35,22 @@
     override val keywords: Int
         get() = R.string.keywords_sounds
 
+    override fun getIcon(context: Context) =
+        when {
+            Flags.homepageRevamp() -> R.drawable.ic_volume_up_filled
+            else -> R.drawable.ic_volume_up_24dp
+        }
+
     override fun isFlagEnabled(context: Context): Boolean = Flags.catalystSoundScreen()
 
     override fun hasCompleteHierarchy() = false
 
     override fun fragmentClass(): Class<out Fragment>? = SoundSettings::class.java
 
-    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {}
+    override fun getPreferenceHierarchy(context: Context) =
+        preferenceHierarchy(this) {
+            +DialPadTonePreference()
+        }
 
     companion object {
         const val KEY = "sound_screen"
diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java
index 596f19b..b069c7e 100644
--- a/src/com/android/settings/notification/SoundSettings.java
+++ b/src/com/android/settings/notification/SoundSettings.java
@@ -195,23 +195,21 @@
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
-        if (!isCatalystEnabled()) {
-            ArrayList<VolumeSeekBarPreferenceController> volumeControllers = new ArrayList<>();
-            volumeControllers.add(use(AlarmVolumePreferenceController.class));
-            volumeControllers.add(use(MediaVolumePreferenceController.class));
-            volumeControllers.add(use(SeparateRingVolumePreferenceController.class));
-            volumeControllers.add(use(NotificationVolumePreferenceController.class));
-            volumeControllers.add(use(CallVolumePreferenceController.class));
+        ArrayList<VolumeSeekBarPreferenceController> volumeControllers = new ArrayList<>();
+        volumeControllers.add(use(AlarmVolumePreferenceController.class));
+        volumeControllers.add(use(MediaVolumePreferenceController.class));
+        volumeControllers.add(use(SeparateRingVolumePreferenceController.class));
+        volumeControllers.add(use(NotificationVolumePreferenceController.class));
+        volumeControllers.add(use(CallVolumePreferenceController.class));
 
-            use(HandsFreeProfileOutputPreferenceController.class).setCallback(listPreference ->
-                    onPreferenceDataChanged(listPreference));
-            mHfpOutputControllerKey =
-                    use(HandsFreeProfileOutputPreferenceController.class).getPreferenceKey();
+        use(HandsFreeProfileOutputPreferenceController.class).setCallback(listPreference ->
+                onPreferenceDataChanged(listPreference));
+        mHfpOutputControllerKey =
+                use(HandsFreeProfileOutputPreferenceController.class).getPreferenceKey();
 
-            for (VolumeSeekBarPreferenceController controller : volumeControllers) {
-                controller.setCallback(mVolumeCallback);
-                getSettingsLifecycle().addObserver(controller);
-            }
+        for (VolumeSeekBarPreferenceController controller : volumeControllers) {
+            controller.setCallback(mVolumeCallback);
+            getSettingsLifecycle().addObserver(controller);
         }
     }
 
diff --git a/src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt b/src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt
index fa9cee2..f7e53ec 100644
--- a/src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt
+++ b/src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt
@@ -140,18 +140,20 @@
 
         AppButtons(packageInfoPresenter, isHibernationSwitchEnabledStateFlow)
 
-        AppSettingsPreference(app)
-        AppAllServicesPreference(app)
-        AppNotificationPreference(app)
-        AppPermissionPreference(app)
-        AppStoragePreference(app)
-        InstantAppDomainsPreference(app)
-        AppDataUsagePreference(app)
-        AppTimeSpentPreference(app)
-        AppBatteryPreference(app)
-        AppLocalePreference(app)
-        AppOpenByDefaultPreference(app)
-        DefaultAppShortcuts(app)
+        Category {
+            AppSettingsPreference(app)
+            AppAllServicesPreference(app)
+            AppNotificationPreference(app)
+            AppPermissionPreference(app)
+            AppStoragePreference(app)
+            InstantAppDomainsPreference(app)
+            AppDataUsagePreference(app)
+            AppTimeSpentPreference(app)
+            AppBatteryPreference(app)
+            AppLocalePreference(app)
+            AppOpenByDefaultPreference(app)
+            DefaultAppShortcuts(app)
+        }
 
         Category(title = stringResource(R.string.unused_apps_category)) {
             HibernationSwitchPreference(app, isHibernationSwitchEnabledStateFlow)
diff --git a/src/com/android/settings/spa/app/battery/BatteryOptimizationModeAppListPageProvider.kt b/src/com/android/settings/spa/app/battery/BatteryOptimizationModeAppListPageProvider.kt
index f077506..5c27f5b 100644
--- a/src/com/android/settings/spa/app/battery/BatteryOptimizationModeAppListPageProvider.kt
+++ b/src/com/android/settings/spa/app/battery/BatteryOptimizationModeAppListPageProvider.kt
@@ -107,7 +107,7 @@
         PowerAllowlistBackend.getInstance(context).refreshList()
         return recordListFlow.filterItem {
             val appOptimizationMode = BatteryOptimizeUtils(context, it.app.uid, it.app.packageName)
-                .getAppOptimizationMode(/* refreshList */ false);
+                .getAppOptimizationMode(/* refreshList */ false, /* ignoreUnknownMode */ true);
             when (OptimizationModeSpinnerItem.entries.getOrNull(option)) {
                 OptimizationModeSpinnerItem.Restricted ->
                     appOptimizationMode == BatteryOptimizeUtils.MODE_RESTRICTED
diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp
index 84c84b0..1cac363 100644
--- a/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@ -109,7 +109,10 @@
 
 java_library {
     name: "Settings-robo-testutils",
-    srcs: ["testutils/**/*.java"],
+    srcs: [
+        "testutils/**/*.java",
+        "testutils/**/*.kt",
+    ],
     libs: [
         "Robolectric_all-target_upstream",
         "Settings-core",
diff --git a/tests/robotests/OWNERS b/tests/robotests/OWNERS
index 8a7a27e..e15af1c 100644
--- a/tests/robotests/OWNERS
+++ b/tests/robotests/OWNERS
@@ -1,2 +1,3 @@
 # We do not guard tests - everyone is welcomed to contribute to tests.
-per-file *.java=*
\ No newline at end of file
+per-file *.java=*
+per-file *.kt=*
diff --git a/tests/robotests/src/com/android/settings/accessibility/ColorAndMotionScreenTest.kt b/tests/robotests/src/com/android/settings/accessibility/ColorAndMotionScreenTest.kt
new file mode 100644
index 0000000..6d7164e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/ColorAndMotionScreenTest.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2024 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 androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.flags.Flags
+import com.android.settingslib.preference.CatalystScreenTestCase
+import com.android.settingslib.preference.PreferenceScreenCreator
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class ColorAndMotionScreenTest : CatalystScreenTestCase() {
+    override val preferenceScreenCreator: PreferenceScreenCreator = ColorAndMotionScreen()
+    override val flagName: String = Flags.FLAG_CATALYST_ACCESSIBILITY_COLOR_AND_MOTION
+
+    override fun migration() {}
+
+    @Test
+    fun key() {
+        assertThat(preferenceScreenCreator.key).isEqualTo(ColorAndMotionScreen.KEY)
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/accessibility/TextReadingScreenTest.kt b/tests/robotests/src/com/android/settings/accessibility/TextReadingScreenTest.kt
new file mode 100644
index 0000000..bdc69c9
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/TextReadingScreenTest.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2024 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 androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.flags.Flags
+import com.android.settingslib.preference.CatalystScreenTestCase
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class TextReadingScreenTest : CatalystScreenTestCase() {
+
+    override val preferenceScreenCreator = TextReadingScreen()
+
+    override val flagName: String
+        get() = Flags.FLAG_CATALYST_TEXT_READING_SCREEN
+
+    override fun migration() {}
+
+    @Test
+    fun key() {
+        assertThat(preferenceScreenCreator.key).isEqualTo(TextReadingScreen.KEY)
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/VibrationIntensityScreenTest.kt b/tests/robotests/src/com/android/settings/accessibility/VibrationIntensityScreenTest.kt
new file mode 100644
index 0000000..99851de
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/VibrationIntensityScreenTest.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2024 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 androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.flags.Flags
+import com.android.settingslib.preference.CatalystScreenTestCase
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class VibrationIntensityScreenTest : CatalystScreenTestCase() {
+
+    override val preferenceScreenCreator = VibrationIntensityScreen()
+
+    override val flagName: String
+        get() = Flags.FLAG_CATALYST_VIBRATION_INTENSITY_SCREEN
+
+    @Test
+    fun key() {
+        assertThat(preferenceScreenCreator.key).isEqualTo(VibrationIntensityScreen.KEY)
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragmentTest.java
index 414fe63..b3270e9 100644
--- a/tests/robotests/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragmentTest.java
@@ -16,6 +16,9 @@
 
 package com.android.settings.accessibility.shortcuts;
 
+import static android.provider.Settings.ACTION_ACCESSIBILITY_SHORTCUT_SETTINGS;
+
+import static com.android.internal.accessibility.AccessibilityShortcutController.DALTONIZER_COMPONENT_NAME;
 import static com.android.internal.accessibility.AccessibilityShortcutController.MAGNIFICATION_COMPONENT_NAME;
 import static com.android.internal.accessibility.AccessibilityShortcutController.MAGNIFICATION_CONTROLLER_NAME;
 import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.SOFTWARE;
@@ -45,6 +48,7 @@
 import android.view.accessibility.AccessibilityManager;
 import android.view.accessibility.Flags;
 
+import androidx.annotation.Nullable;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.testing.FragmentScenario;
 import androidx.lifecycle.Lifecycle;
@@ -160,7 +164,7 @@
     public void showEditShortcutScreen_inSuw_launchSubSettingWithSuw() {
         EditShortcutsPreferenceFragment.showEditShortcutScreen(
                 mActivity, METRICS_CATEGORY, SCREEN_TITLE,
-                TARGET_FAKE_COMPONENT, createSuwIntent(new Intent(), /* isInSuw= */ true));
+                TARGET_FAKE_COMPONENT, setIntentInSuw(new Intent(), /* isInSuw= */ true));
 
         assertLaunchSubSettingWithCurrentTargetComponents(
                 TARGET_FAKE_COMPONENT.flattenToString(), /* isInSuw= */ true);
@@ -199,6 +203,53 @@
     }
 
     @Test
+    @EnableFlags(
+            com.android.settings.accessibility.Flags.FLAG_TOGGLE_FEATURE_FRAGMENT_COLLECTION_INFO)
+    public void shortcutDescriptionPref_defaultLaunch_notVisible() {
+        mFragmentScenario = createFragScenario(/* isInSuw= */ false, TARGET);
+        mFragmentScenario.moveToState(Lifecycle.State.CREATED);
+
+        mFragmentScenario.onFragment(fragment -> {
+            Preference preference = fragment.findPreference(
+                    mContext.getString(R.string.accessibility_shortcut_description_pref));
+            assertThat(preference.isVisible()).isFalse();
+        });
+    }
+
+    @Test
+    @EnableFlags(
+            com.android.settings.accessibility.Flags.FLAG_TOGGLE_FEATURE_FRAGMENT_COLLECTION_INFO)
+    public void shortcutDescriptionPref_launchFromAction_singleTarget_notVisible() {
+        mFragmentScenario = createFragScenario(/* isInSuw= */ false, List.of(TARGET),
+                ACTION_ACCESSIBILITY_SHORTCUT_SETTINGS);
+        mFragmentScenario.moveToState(Lifecycle.State.CREATED);
+
+        mFragmentScenario.onFragment(fragment -> {
+            Preference preference = fragment.findPreference(
+                    mContext.getString(R.string.accessibility_shortcut_description_pref));
+            assertThat(preference.isVisible()).isFalse();
+        });
+    }
+
+    @Test
+    @EnableFlags(
+            com.android.settings.accessibility.Flags.FLAG_TOGGLE_FEATURE_FRAGMENT_COLLECTION_INFO)
+    public void shortcutDescriptionPref_launchFromAction_multipleTargets_isVisible() {
+        mFragmentScenario = createFragScenario(/* isInSuw= */ false,
+                // Both of these components are system components with known labels, so we don't
+                // need to mock AccessibilityManager with fake labels.
+                List.of(TARGET, DALTONIZER_COMPONENT_NAME.flattenToString()),
+                ACTION_ACCESSIBILITY_SHORTCUT_SETTINGS);
+        mFragmentScenario.moveToState(Lifecycle.State.CREATED);
+
+        mFragmentScenario.onFragment(fragment -> {
+            Preference preference = fragment.findPreference(
+                    mContext.getString(R.string.accessibility_shortcut_description_pref));
+            assertThat(preference.isVisible()).isTrue();
+        });
+    }
+
+    @Test
     public void fragmentCreated_settingsObserversAreRegistered() {
         ShadowContentResolver contentResolver = shadowOf(mContext.getContentResolver());
         for (Uri uri : SHORTCUT_SETTINGS) {
@@ -654,9 +705,14 @@
 
     private FragmentScenario<EditShortcutsPreferenceFragment> createFragScenario(
             boolean isInSuw, String target) {
+        return createFragScenario(isInSuw, List.of(target), null);
+    }
+    private FragmentScenario<EditShortcutsPreferenceFragment> createFragScenario(
+            boolean isInSuw, List<String> targets, @Nullable String intentAction) {
         Bundle args = new Bundle();
         args.putStringArray(
-                EditShortcutsPreferenceFragment.ARG_KEY_SHORTCUT_TARGETS, new String[]{target});
+                EditShortcutsPreferenceFragment.ARG_KEY_SHORTCUT_TARGETS,
+                targets.toArray(new String[0]));
         FragmentScenario<EditShortcutsPreferenceFragment> scenario =
                 FragmentScenario.launch(
                         EditShortcutsPreferenceFragment.class, args,
@@ -664,7 +720,11 @@
         scenario.onFragment(fragment -> {
             Intent intent = fragment.requireActivity().getIntent();
             intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE, SCREEN_TITLE);
-            fragment.requireActivity().setIntent(createSuwIntent(intent, isInSuw));
+            setIntentInSuw(intent, isInSuw);
+            if (intentAction != null) {
+                intent.setAction(intentAction);
+            }
+            fragment.requireActivity().setIntent(intent);
             // Since the fragment is attached before we have a chance
             // to modify the activity's intent; initialize controllers again
             fragment.initializePreferenceControllerArguments();
@@ -672,11 +732,7 @@
         return scenario;
     }
 
-    private Intent createSuwIntent(Intent intent, boolean isInSuw) {
-
-        if (intent == null) {
-            intent = new Intent();
-        }
+    private Intent setIntentInSuw(Intent intent, boolean isInSuw) {
         intent.putExtra(EXTRA_IS_SETUP_FLOW, isInSuw);
         intent.putExtra(EXTRA_IS_FIRST_RUN, isInSuw);
         intent.putExtra(EXTRA_IS_PRE_DEFERRED_SETUP, isInSuw);
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 8f983de..df2ab45 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
@@ -63,12 +63,14 @@
 
 import com.android.settings.R;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SystemProperty;
 import com.android.settings.widget.RingProgressBar;
 
 import com.airbnb.lottie.LottieAnimationView;
 import com.airbnb.lottie.LottieTask;
 import com.google.android.setupdesign.GlifLayout;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -111,15 +113,23 @@
     private final int[] mSfpsStageThresholds = new int[]{0, 9, 13, 19, 25};
     private final int[] mUdfpsStageThresholds = new int[]{0, 13, 17, 22};
 
+    private final SystemProperty mSystemProperty = new SystemProperty();
+
     private FingerprintEnrollEnrolling mActivity;
     private Context mContext;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        mSystemProperty.override("robolectric.createActivityContexts", "true");
         FakeFeatureFactory.setupForTest();
     }
 
+    @After
+    public void tearDown() {
+        mSystemProperty.close();
+    }
+
     @Test
     public void fingerprintUdfpsEnrollSuccessProgress_shouldNotVibrate() {
         initializeActivityFor(TYPE_UDFPS_OPTICAL);
@@ -645,7 +655,6 @@
     }
 
     private void createActivity() {
-        System.setProperty("robolectric.createActivityContexts", "true");
         final Bundle savedInstanceState = new Bundle();
         savedInstanceState.putInt(KEY_STATE_PREVIOUS_ROTATION, Surface.ROTATION_90);
 
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardScreenTest.kt b/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardScreenTest.kt
new file mode 100644
index 0000000..16db841
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardScreenTest.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2024 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.connecteddevice
+
+import android.content.Intent
+import android.provider.Settings.Global
+import androidx.preference.PreferenceFragmentCompat
+import androidx.test.core.app.ActivityScenario
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.Settings.BluetoothDashboardActivity
+import com.android.settings.flags.Flags
+import com.android.settingslib.preference.CatalystScreenTestCase
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class BluetoothDashboardScreenTest : CatalystScreenTestCase() {
+    override val preferenceScreenCreator = BluetoothDashboardScreen()
+
+    override val flagName: String
+        get() = Flags.FLAG_CATALYST_BLUETOOTH_SWITCHBAR_SCREEN
+
+    @Test
+    fun key() {
+        assertThat(preferenceScreenCreator.key).isEqualTo(BluetoothDashboardScreen.KEY)
+    }
+
+    override fun launchFragment(
+        fragmentClass: Class<PreferenceFragmentCompat>,
+        action: (PreferenceFragmentCompat) -> Unit,
+    ) {
+        Global.putInt(appContext.contentResolver, Global.DEVICE_PROVISIONED, 1)
+        val intent = Intent(appContext, BluetoothDashboardActivity::class.java)
+        ActivityScenario.launch<BluetoothDashboardActivity>(intent).use {
+            it.onActivity { activity ->
+                val fragment = activity.supportFragmentManager.fragments[0]
+                assertThat(fragment.javaClass).isEqualTo(fragmentClass)
+                action(fragment as PreferenceFragmentCompat)
+            }
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/LinuxTerminalPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LinuxTerminalPreferenceControllerTest.java
new file mode 100644
index 0000000..96b6d6a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/LinuxTerminalPreferenceControllerTest.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2024 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.development;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.eq;
+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.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+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;
+
+@RunWith(RobolectricTestRunner.class)
+public class LinuxTerminalPreferenceControllerTest {
+
+    @Mock
+    private Context mContext;
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private PackageManager mPackageManager;
+    @Mock
+    private ApplicationInfo mApplicationInfo;
+
+    private String mTerminalPackageName = "com.android.virtualization.terminal";
+    private LinuxTerminalPreferenceController mController;
+
+    @Before
+    public void setup() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        doReturn(mPackageManager).when(mContext).getPackageManager();
+        doReturn(mApplicationInfo).when(mPackageManager).getApplicationInfo(
+                eq(mTerminalPackageName), any());
+
+        mController = spy(new LinuxTerminalPreferenceController(mContext));
+        doReturn(true).when(mController).isAvailable();
+        doReturn(mTerminalPackageName).when(mController).getTerminalPackageName();
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+                .thenReturn(mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void isAvailable_whenPackageNameIsNull_returnsFalse() throws Exception {
+        mController = spy(new LinuxTerminalPreferenceController(mContext));
+        doReturn(null).when(mController).getTerminalPackageName();
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_whenAppDoesNotExist_returnsFalse() throws Exception {
+        doThrow(new NameNotFoundException()).when(mPackageManager).getApplicationInfo(
+                eq(mTerminalPackageName), any());
+
+        mController = spy(new LinuxTerminalPreferenceController(mContext));
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void onPreferenceChanged_turnOnTerminal() {
+        mController.onPreferenceChange(null, true);
+
+        verify(mPackageManager).setApplicationEnabledSetting(
+                mTerminalPackageName,
+                PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
+                /* flags= */ 0);
+    }
+
+    @Test
+    public void onPreferenceChanged_turnOffTerminal() {
+        mController.onPreferenceChange(null, false);
+
+        verify(mPackageManager).setApplicationEnabledSetting(
+                mTerminalPackageName,
+                PackageManager.COMPONENT_ENABLED_STATE_DEFAULT,
+                /* flags= */ 0);
+    }
+
+    @Test
+    public void updateState_preferenceShouldBeChecked() {
+        when(mPackageManager.getApplicationEnabledSetting(mTerminalPackageName))
+                .thenReturn(PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_preferenceShouldNotBeChecked() {
+        when(mPackageManager.getApplicationEnabledSetting(mTerminalPackageName))
+                .thenReturn(PackageManager.COMPONENT_ENABLED_STATE_DEFAULT);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/display/DeviceStateAutoRotateDetailsFragmentTest.java b/tests/robotests/src/com/android/settings/display/DeviceStateAutoRotateDetailsFragmentTest.java
index e5940b6..d1c32a2 100644
--- a/tests/robotests/src/com/android/settings/display/DeviceStateAutoRotateDetailsFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/display/DeviceStateAutoRotateDetailsFragmentTest.java
@@ -16,16 +16,26 @@
 
 package com.android.settings.display;
 
+import static android.hardware.devicestate.DeviceState.PROPERTY_EMULATED_ONLY;
+import static android.hardware.devicestate.DeviceState.PROPERTY_FEATURE_REAR_DISPLAY;
+import static android.hardware.devicestate.DeviceState.PROPERTY_FOLDABLE_DISPLAY_CONFIGURATION_INNER_PRIMARY;
+import static android.hardware.devicestate.DeviceState.PROPERTY_FOLDABLE_DISPLAY_CONFIGURATION_OUTER_PRIMARY;
+import static android.hardware.devicestate.DeviceState.PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_CLOSED;
+import static android.hardware.devicestate.DeviceState.PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_HALF_OPEN;
+import static android.hardware.devicestate.DeviceState.PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_OPEN;
 import static android.provider.Settings.Secure.DEVICE_STATE_ROTATION_LOCK_LOCKED;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.res.Resources;
+import android.hardware.devicestate.DeviceState;
+import android.hardware.devicestate.DeviceStateManager;
 
 import com.android.settings.R;
 import com.android.settingslib.core.AbstractPreferenceController;
@@ -34,29 +44,61 @@
 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 org.robolectric.RuntimeEnvironment;
 
 import java.util.List;
+import java.util.Set;
 
 @RunWith(RobolectricTestRunner.class)
 public class DeviceStateAutoRotateDetailsFragmentTest {
-    private static final int FOLDED_STATE = 0;
-    private static final int HALF_FOLDED_STATE = 1;
-    private static final int UNFOLDED_STATE = 2;
-    private static final int REAR_DISPLAY_STATE = 3;
+    private static final DeviceState DEVICE_STATE_FOLDED = new DeviceState(
+            new DeviceState.Configuration.Builder(/* identifier= */ 0, "FOLDED")
+                    .setSystemProperties(Set.of(
+                            PROPERTY_FOLDABLE_DISPLAY_CONFIGURATION_OUTER_PRIMARY))
+                    .setPhysicalProperties(Set.of(
+                            PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_CLOSED))
+                    .build());
+    private static final DeviceState DEVICE_STATE_HALF_FOLDED = new DeviceState(
+            new DeviceState.Configuration.Builder(/* identifier= */ 1, "HALF_FOLDED")
+                    .setSystemProperties(Set.of(
+                            PROPERTY_FOLDABLE_DISPLAY_CONFIGURATION_INNER_PRIMARY))
+                    .setPhysicalProperties(Set.of(
+                            PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_HALF_OPEN))
+                    .build());
+    private static final DeviceState DEVICE_STATE_UNFOLDED = new DeviceState(
+            new DeviceState.Configuration.Builder(/* identifier= */ 2, "UNFOLDED")
+                    .setSystemProperties(Set.of(
+                            PROPERTY_FOLDABLE_DISPLAY_CONFIGURATION_INNER_PRIMARY))
+                    .setPhysicalProperties(Set.of(
+                            PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_OPEN))
+                    .build());
+    private static final DeviceState DEVICE_STATE_REAR_DISPLAY = new DeviceState(
+            new DeviceState.Configuration.Builder(/* identifier= */ 3, "REAR_DISPLAY")
+                    .setSystemProperties(Set.of(
+                            PROPERTY_FOLDABLE_DISPLAY_CONFIGURATION_OUTER_PRIMARY,
+                            PROPERTY_FEATURE_REAR_DISPLAY, PROPERTY_EMULATED_ONLY))
+                    .setPhysicalProperties(Set.of(
+                            PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_CLOSED))
+                    .build());
 
     private final DeviceStateAutoRotateDetailsFragment mFragment =
             spy(new DeviceStateAutoRotateDetailsFragment());
     private final Context mContext = spy(RuntimeEnvironment.application);
     private final Resources mResources = spy(mContext.getResources());
+    @Mock
+    private DeviceStateManager mDeviceStateManager;
 
     @Before
     public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
         when(mContext.getResources()).thenReturn(mResources);
         when(mContext.getApplicationContext()).thenReturn(mContext);
         when(mFragment.getContext()).thenReturn(mContext);
         when(mFragment.getResources()).thenReturn(mResources);
+        doReturn(mDeviceStateManager).when(mContext).getSystemService(DeviceStateManager.class);
         setUpPostureMappings();
     }
 
@@ -75,8 +117,10 @@
     @Test
     public void createPreferenceControllers_settableDeviceStates_returnsDeviceStateControllers() {
         enableDeviceStateSettableRotationStates(
-                new String[]{FOLDED_STATE + ":" + DEVICE_STATE_ROTATION_LOCK_LOCKED,
-                        UNFOLDED_STATE + ":" + DEVICE_STATE_ROTATION_LOCK_LOCKED},
+                new String[]{DEVICE_STATE_FOLDED.getIdentifier() + ":"
+                        + DEVICE_STATE_ROTATION_LOCK_LOCKED,
+                        DEVICE_STATE_UNFOLDED.getIdentifier() + ":"
+                                + DEVICE_STATE_ROTATION_LOCK_LOCKED},
                 new String[]{"Folded", "Unfolded"});
 
         List<AbstractPreferenceController> preferenceControllers =
@@ -112,18 +156,22 @@
                 .resetStateForTesting(mResources);
     }
 
+    // Sets up posture mappings for PosturesHelper
     private void setUpPostureMappings() {
         when(mResources.getIntArray(
                 com.android.internal.R.array.config_foldedDeviceStates)).thenReturn(
-                new int[]{FOLDED_STATE});
+                    new int[]{DEVICE_STATE_FOLDED.getIdentifier()});
         when(mResources.getIntArray(
                 com.android.internal.R.array.config_halfFoldedDeviceStates)).thenReturn(
-                new int[]{HALF_FOLDED_STATE});
+                    new int[]{DEVICE_STATE_HALF_FOLDED.getIdentifier()});
         when(mResources.getIntArray(
                 com.android.internal.R.array.config_openDeviceStates)).thenReturn(
-                new int[]{UNFOLDED_STATE});
+                    new int[]{DEVICE_STATE_UNFOLDED.getIdentifier()});
         when(mResources.getIntArray(
                 com.android.internal.R.array.config_rearDisplayDeviceStates)).thenReturn(
-                new int[]{REAR_DISPLAY_STATE});
+                    new int[]{DEVICE_STATE_REAR_DISPLAY.getIdentifier()});
+        when(mDeviceStateManager.getSupportedDeviceStates()).thenReturn(
+                List.of(DEVICE_STATE_FOLDED, DEVICE_STATE_HALF_FOLDED, DEVICE_STATE_UNFOLDED,
+                        DEVICE_STATE_REAR_DISPLAY));
     }
 }
diff --git a/tests/robotests/src/com/android/settings/display/DeviceStateAutoRotateSettingControllerTest.java b/tests/robotests/src/com/android/settings/display/DeviceStateAutoRotateSettingControllerTest.java
index d364a3b..cb1be85 100644
--- a/tests/robotests/src/com/android/settings/display/DeviceStateAutoRotateSettingControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/DeviceStateAutoRotateSettingControllerTest.java
@@ -21,10 +21,13 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.verify;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
+import android.hardware.devicestate.DeviceState;
+import android.hardware.devicestate.DeviceStateManager;
 
 import androidx.preference.Preference;
 import androidx.preference.PreferenceManager;
@@ -41,6 +44,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
@@ -56,15 +60,16 @@
 })
 public class DeviceStateAutoRotateSettingControllerTest {
 
-    private static final int DEFAULT_DEVICE_STATE = 1;
+    private static final DeviceState DEFAULT_DEVICE_STATE = new DeviceState(
+            new DeviceState.Configuration.Builder(/* identifier= */ 1, "DEFAULT").build());
     private static final String DEFAULT_DEVICE_STATE_DESCRIPTION = "Device state description";
     private static final int DEFAULT_ORDER = -10;
 
-    private final Context mContext = RuntimeEnvironment.application;
-    private final DeviceStateRotationLockSettingsManager mAutoRotateSettingsManager =
-            DeviceStateRotationLockSettingsManager.getInstance(mContext);
+    private final Context mContext = Mockito.spy(RuntimeEnvironment.application);
+    private DeviceStateRotationLockSettingsManager mAutoRotateSettingsManager;
 
     @Mock private MetricsFeatureProvider mMetricsFeatureProvider;
+    @Mock private DeviceStateManager mDeviceStateManager;
 
     private DeviceStateAutoRotateSettingController mController;
 
@@ -72,9 +77,15 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
+        doReturn(mContext).when(mContext).getApplicationContext();
+        doReturn(mDeviceStateManager).when(mContext).getSystemService(DeviceStateManager.class);
+        doReturn(List.of(DEFAULT_DEVICE_STATE)).when(
+                mDeviceStateManager).getSupportedDeviceStates();
+        mAutoRotateSettingsManager =
+                DeviceStateRotationLockSettingsManager.getInstance(mContext);
         mController = new DeviceStateAutoRotateSettingController(
                 mContext,
-                DEFAULT_DEVICE_STATE,
+                DEFAULT_DEVICE_STATE.getIdentifier(),
                 DEFAULT_DEVICE_STATE_DESCRIPTION,
                 DEFAULT_ORDER,
                 mMetricsFeatureProvider
@@ -128,20 +139,22 @@
     public void getPreferenceKey_returnsKeyBasedOnDeviceState() {
         String key = mController.getPreferenceKey();
 
-        String expectedKey = "auto_rotate_device_state_" + DEFAULT_DEVICE_STATE;
+        String expectedKey = "auto_rotate_device_state_" + DEFAULT_DEVICE_STATE.getIdentifier();
         assertThat(key).isEqualTo(expectedKey);
     }
 
     @Test
     public void isChecked_settingForStateIsUnlocked_returnsTrue() {
-        mAutoRotateSettingsManager.updateSetting(DEFAULT_DEVICE_STATE, /* rotationLocked= */ false);
+        mAutoRotateSettingsManager.updateSetting(
+                DEFAULT_DEVICE_STATE.getIdentifier(), /* rotationLocked= */ false);
 
         assertThat(mController.isChecked()).isTrue();
     }
 
     @Test
     public void isChecked_settingForStateIsLocked_returnsFalse() {
-        mAutoRotateSettingsManager.updateSetting(DEFAULT_DEVICE_STATE, /* rotationLocked= */ true);
+        mAutoRotateSettingsManager.updateSetting(
+                DEFAULT_DEVICE_STATE.getIdentifier(), /* rotationLocked= */ true);
 
         assertThat(mController.isChecked()).isFalse();
     }
@@ -150,7 +163,8 @@
     public void setChecked_true_deviceStateSettingIsUnlocked() {
         mController.setChecked(true);
 
-        boolean rotationLocked = mAutoRotateSettingsManager.isRotationLocked(DEFAULT_DEVICE_STATE);
+        boolean rotationLocked = mAutoRotateSettingsManager.isRotationLocked(
+                DEFAULT_DEVICE_STATE.getIdentifier());
 
         assertThat(rotationLocked).isFalse();
     }
@@ -159,7 +173,8 @@
     public void setChecked_false_deviceStateSettingIsLocked() {
         mController.setChecked(false);
 
-        boolean rotationLocked = mAutoRotateSettingsManager.isRotationLocked(DEFAULT_DEVICE_STATE);
+        boolean rotationLocked = mAutoRotateSettingsManager.isRotationLocked(
+                DEFAULT_DEVICE_STATE.getIdentifier());
 
         assertThat(rotationLocked).isTrue();
     }
@@ -169,7 +184,8 @@
         mController.setChecked(true);
 
         verify(mMetricsFeatureProvider).action(mContext,
-                SettingsEnums.ACTION_ENABLE_AUTO_ROTATION_DEVICE_STATE, DEFAULT_DEVICE_STATE);
+                SettingsEnums.ACTION_ENABLE_AUTO_ROTATION_DEVICE_STATE,
+                DEFAULT_DEVICE_STATE.getIdentifier());
     }
 
     @Test
@@ -177,7 +193,8 @@
         mController.setChecked(false);
 
         verify(mMetricsFeatureProvider).action(mContext,
-                SettingsEnums.ACTION_DISABLE_AUTO_ROTATION_DEVICE_STATE, DEFAULT_DEVICE_STATE);
+                SettingsEnums.ACTION_DISABLE_AUTO_ROTATION_DEVICE_STATE,
+                DEFAULT_DEVICE_STATE.getIdentifier());
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/display/DisplayScreenTest.kt b/tests/robotests/src/com/android/settings/display/DisplayScreenTest.kt
index 6a7c238..342aa54 100644
--- a/tests/robotests/src/com/android/settings/display/DisplayScreenTest.kt
+++ b/tests/robotests/src/com/android/settings/display/DisplayScreenTest.kt
@@ -21,9 +21,9 @@
 import com.android.internal.widget.LockPatternUtils
 import com.android.settings.flags.Flags
 import com.android.settings.testutils.FakeFeatureFactory
+import com.android.settings.testutils.SystemProperty
 import com.android.settingslib.preference.CatalystScreenTestCase
 import com.google.common.truth.Truth.assertThat
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.ArgumentMatchers.anyInt
@@ -42,8 +42,8 @@
 
     private val mockResources = mock<Resources>()
 
-    private val contextWrapper =
-        object : ContextWrapper(context) {
+    private val context =
+        object : ContextWrapper(appContext) {
             override fun getResources(): Resources = mockResources
         }
 
@@ -56,26 +56,26 @@
     fun isAvailable_configTrue_shouldReturnTrue() {
         mockResources.stub { on { getBoolean(anyInt()) } doReturn true }
 
-        assertThat(preferenceScreenCreator.isAvailable(contextWrapper)).isTrue()
+        assertThat(preferenceScreenCreator.isAvailable(context)).isTrue()
     }
 
     @Test
     fun isAvailable_configFalse_shouldReturnFalse() {
         mockResources.stub { on { getBoolean(anyInt()) } doReturn false }
 
-        assertThat(preferenceScreenCreator.isAvailable(contextWrapper)).isFalse()
+        assertThat(preferenceScreenCreator.isAvailable(context)).isFalse()
     }
 
-    @Ignore("robolectric.createActivityContexts cause other test failure")
     override fun migration() {
         // avoid UnsupportedOperationException when getDisplay from context
-        System.setProperty("robolectric.createActivityContexts", "true")
+        SystemProperty("robolectric.createActivityContexts", "true").use {
+            val lockPatternUtils =
+                mock<LockPatternUtils> { on { isSecure(anyInt()) } doReturn true }
+            FakeFeatureFactory.setupForTest().securityFeatureProvider.stub {
+                on { getLockPatternUtils(any()) } doReturn lockPatternUtils
+            }
 
-        val lockPatternUtils = mock<LockPatternUtils> { on { isSecure(anyInt()) } doReturn true }
-        FakeFeatureFactory.setupForTest().securityFeatureProvider.stub {
-            on { getLockPatternUtils(any()) } doReturn lockPatternUtils
+            super.migration()
         }
-
-        super.migration()
     }
 }
diff --git a/tests/robotests/src/com/android/settings/display/SmartAutoRotateControllerTest.java b/tests/robotests/src/com/android/settings/display/SmartAutoRotateControllerTest.java
index 63395d1..e2542b0 100644
--- a/tests/robotests/src/com/android/settings/display/SmartAutoRotateControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/SmartAutoRotateControllerTest.java
@@ -33,6 +33,8 @@
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
+import android.hardware.devicestate.DeviceState;
+import android.hardware.devicestate.DeviceStateManager;
 import android.os.UserHandle;
 import android.provider.Settings;
 
@@ -56,6 +58,8 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.shadow.api.Shadow;
 
+import java.util.List;
+
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {ShadowSensorPrivacyManager.class, ShadowSystemSettings.class})
 public class SmartAutoRotateControllerTest {
@@ -67,21 +71,30 @@
     private PackageManager mPackageManager;
     @Mock
     private Preference mPreference;
+    @Mock
+    private DeviceStateManager mDeviceStateManager;
     private ContentResolver mContentResolver;
-    private final DeviceStateRotationLockSettingsManager mDeviceStateAutoRotateSettingsManager =
-            DeviceStateRotationLockSettingsManager.getInstance(RuntimeEnvironment.application);
+    private DeviceStateRotationLockSettingsManager mDeviceStateAutoRotateSettingsManager;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         final Context context = Mockito.spy(RuntimeEnvironment.application);
         mContentResolver = RuntimeEnvironment.application.getContentResolver();
+
         when(context.getPackageManager()).thenReturn(mPackageManager);
         when(context.getContentResolver()).thenReturn(mContentResolver);
         doReturn(PACKAGE_NAME).when(mPackageManager).getRotationResolverPackageName();
         doReturn(PackageManager.PERMISSION_GRANTED).when(mPackageManager).checkPermission(
                 Manifest.permission.CAMERA, PACKAGE_NAME);
+        // Necessary for the DeviceStateRotationLockSettingsManager setup
+        doReturn(context).when(context).getApplicationContext();
+        doReturn(mDeviceStateManager).when(context).getSystemService(DeviceStateManager.class);
+        doReturn(getDeviceStateList()).when(mDeviceStateManager).getSupportedDeviceStates();
+        mDeviceStateAutoRotateSettingsManager = DeviceStateRotationLockSettingsManager.getInstance(
+                context);
         mController = Mockito.spy(new SmartAutoRotateController(context, "test_key"));
+
         when(mController.isCameraLocked()).thenReturn(false);
         when(mController.isPowerSaveMode()).thenReturn(false);
         doReturn(mController.getPreferenceKey()).when(mPreference).getKey();
@@ -183,4 +196,13 @@
                 Shadow.extract(mDeviceStateAutoRotateSettingsManager);
         shadowManager.setRotationLockedForAllStates(false);
     }
+
+    /**
+     * Returns a list that includes a singular default {@link DeviceState}. To be returned when
+     * {@link DeviceStateManager#getSupportedDeviceStates()} is called.
+     */
+    private List<DeviceState> getDeviceStateList() {
+        return List.of(new DeviceState(
+                new DeviceState.Configuration.Builder(0 /* identifier */, "DEFAULT").build()));
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceFragmentTest.java
index 3fa4582..1615538 100644
--- a/tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceFragmentTest.java
@@ -16,6 +16,13 @@
 
 package com.android.settings.display;
 
+import static android.hardware.devicestate.DeviceState.PROPERTY_EMULATED_ONLY;
+import static android.hardware.devicestate.DeviceState.PROPERTY_FEATURE_REAR_DISPLAY;
+import static android.hardware.devicestate.DeviceState.PROPERTY_FOLDABLE_DISPLAY_CONFIGURATION_INNER_PRIMARY;
+import static android.hardware.devicestate.DeviceState.PROPERTY_FOLDABLE_DISPLAY_CONFIGURATION_OUTER_PRIMARY;
+import static android.hardware.devicestate.DeviceState.PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_CLOSED;
+import static android.hardware.devicestate.DeviceState.PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_HALF_OPEN;
+import static android.hardware.devicestate.DeviceState.PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_OPEN;
 import static android.provider.Settings.Secure.DEVICE_STATE_ROTATION_LOCK_LOCKED;
 
 import static com.android.settings.display.SmartAutoRotatePreferenceFragment.AUTO_ROTATE_MAIN_SWITCH_PREFERENCE_KEY;
@@ -39,6 +46,8 @@
 import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
 import android.content.res.Resources;
+import android.hardware.devicestate.DeviceState;
+import android.hardware.devicestate.DeviceStateManager;
 import android.view.View;
 
 import androidx.preference.Preference;
@@ -61,6 +70,7 @@
 import org.robolectric.annotation.Config;
 
 import java.util.List;
+import java.util.Set;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {
@@ -70,10 +80,35 @@
 })
 public class SmartAutoRotatePreferenceFragmentTest {
 
-    private static final int STATE_FOLDED = 0;
-    private static final int STATE_HALF_FOLDED = 1;
-    private static final int STATE_UNFOLDED = 2;
-    private static final int STATE_REAR_DISPLAY = 3;
+    private static final DeviceState DEVICE_STATE_FOLDED = new DeviceState(
+            new DeviceState.Configuration.Builder(/* identifier= */ 0, "FOLDED")
+                    .setSystemProperties(Set.of(
+                            PROPERTY_FOLDABLE_DISPLAY_CONFIGURATION_OUTER_PRIMARY))
+                    .setPhysicalProperties(Set.of(
+                            PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_CLOSED))
+                    .build());
+    private static final DeviceState DEVICE_STATE_HALF_FOLDED = new DeviceState(
+            new DeviceState.Configuration.Builder(/* identifier= */ 1, "HALF_FOLDED")
+                    .setSystemProperties(Set.of(
+                            PROPERTY_FOLDABLE_DISPLAY_CONFIGURATION_INNER_PRIMARY))
+                    .setPhysicalProperties(Set.of(
+                            PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_HALF_OPEN))
+                    .build());
+    private static final DeviceState DEVICE_STATE_UNFOLDED = new DeviceState(
+            new DeviceState.Configuration.Builder(/* identifier= */ 2, "UNFOLDED")
+                    .setSystemProperties(Set.of(
+                            PROPERTY_FOLDABLE_DISPLAY_CONFIGURATION_INNER_PRIMARY))
+                    .setPhysicalProperties(Set.of(
+                            PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_OPEN))
+                    .build());
+    private static final DeviceState DEVICE_STATE_REAR_DISPLAY = new DeviceState(
+            new DeviceState.Configuration.Builder(/* identifier= */ 3, "REAR_DISPLAY")
+                    .setSystemProperties(Set.of(
+                            PROPERTY_FOLDABLE_DISPLAY_CONFIGURATION_OUTER_PRIMARY,
+                            PROPERTY_FEATURE_REAR_DISPLAY, PROPERTY_EMULATED_ONLY))
+                    .setPhysicalProperties(Set.of(
+                            PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_CLOSED))
+                    .build());
 
     private static final String PACKAGE_NAME = "package_name";
 
@@ -96,6 +131,9 @@
     @Mock
     private Preference mRotateMainSwitchPreference;
 
+    @Mock
+    private DeviceStateManager mDeviceStateManager;
+
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
@@ -105,6 +143,7 @@
         when(mContext.getPackageManager()).thenReturn(mPackageManager);
         when(mContext.getContentResolver()).thenReturn(mContentResolver);
         when(mContext.getApplicationContext()).thenReturn(mContext);
+        doReturn(mDeviceStateManager).when(mContext).getSystemService(DeviceStateManager.class);
         doReturn(PACKAGE_NAME).when(mPackageManager).getRotationResolverPackageName();
         doReturn(PackageManager.PERMISSION_GRANTED).when(mPackageManager).checkPermission(
                 Manifest.permission.CAMERA, PACKAGE_NAME);
@@ -130,14 +169,7 @@
         when(mFragment.findPreference(AUTO_ROTATE_MAIN_SWITCH_PREFERENCE_KEY))
                 .thenReturn(mRotateMainSwitchPreference);
 
-        when(mResources.getIntArray(com.android.internal.R.array.config_foldedDeviceStates))
-                .thenReturn(new int[] {STATE_FOLDED});
-        when(mResources.getIntArray(com.android.internal.R.array.config_halfFoldedDeviceStates))
-                .thenReturn(new int[] {STATE_HALF_FOLDED});
-        when(mResources.getIntArray(com.android.internal.R.array.config_openDeviceStates))
-                .thenReturn(new int[] {STATE_UNFOLDED});
-        when(mResources.getIntArray(com.android.internal.R.array.config_rearDisplayDeviceStates))
-                .thenReturn(new int[] {STATE_REAR_DISPLAY});
+        setUpPostureMappings();
     }
 
     @Test
@@ -195,8 +227,8 @@
     public void createPreferenceControllers_settableDeviceStates_returnsDeviceStateControllers() {
         enableDeviceStateSettableRotationStates(
                 new String[] {
-                    STATE_FOLDED + ":" + DEVICE_STATE_ROTATION_LOCK_LOCKED,
-                    STATE_UNFOLDED + ":" + DEVICE_STATE_ROTATION_LOCK_LOCKED
+                    DEVICE_STATE_FOLDED.getIdentifier() + ":" + DEVICE_STATE_ROTATION_LOCK_LOCKED,
+                    DEVICE_STATE_UNFOLDED.getIdentifier() + ":" + DEVICE_STATE_ROTATION_LOCK_LOCKED
                 },
                 new String[] {"Folded", "Unfolded"});
 
@@ -236,4 +268,23 @@
         DeviceStateRotationLockSettingsManager.getInstance(mContext)
                 .resetStateForTesting(mResources);
     }
+
+    // Sets up posture mappings for PosturesHelper
+    private void setUpPostureMappings() {
+        when(mResources.getIntArray(
+                com.android.internal.R.array.config_foldedDeviceStates)).thenReturn(
+                    new int[]{DEVICE_STATE_FOLDED.getIdentifier()});
+        when(mResources.getIntArray(
+                com.android.internal.R.array.config_halfFoldedDeviceStates)).thenReturn(
+                    new int[]{DEVICE_STATE_HALF_FOLDED.getIdentifier()});
+        when(mResources.getIntArray(
+                com.android.internal.R.array.config_openDeviceStates)).thenReturn(
+                    new int[]{DEVICE_STATE_UNFOLDED.getIdentifier()});
+        when(mResources.getIntArray(
+                com.android.internal.R.array.config_rearDisplayDeviceStates)).thenReturn(
+                    new int[]{DEVICE_STATE_REAR_DISPLAY.getIdentifier()});
+        when(mDeviceStateManager.getSupportedDeviceStates()).thenReturn(
+                List.of(DEVICE_STATE_FOLDED, DEVICE_STATE_HALF_FOLDED, DEVICE_STATE_UNFOLDED,
+                        DEVICE_STATE_REAR_DISPLAY));
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
index 1bc00a1..f3848b3 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
@@ -17,10 +17,10 @@
 package com.android.settings.fuelgauge;
 
 import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS;
-import static com.android.settings.fuelgauge.BatteryOptimizeHistoricalLogEntry.Action;
 
 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.anyString;
 import static org.mockito.ArgumentMatchers.nullable;
@@ -49,13 +49,13 @@
 
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
+import com.android.settings.fuelgauge.BatteryOptimizeHistoricalLogEntry.Action;
 import com.android.settings.fuelgauge.batteryusage.BatteryDiffEntry;
 import com.android.settings.fuelgauge.batteryusage.BatteryEntry;
 import com.android.settings.fuelgauge.batteryusage.ConvertUtils;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
 import com.android.settings.widget.EntityHeaderController;
-import com.android.settingslib.PrimarySwitchPreference;
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
@@ -87,12 +87,12 @@
         })
 public class AdvancedPowerUsageDetailTest {
 
-    @Rule
-    public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+    @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
 
     private static final String APP_LABEL = "app label";
     private static final String SUMMARY = "summary";
-    private static final String[] PACKAGE_NAME = {"com.android.app"};
+    private static final String PACKAGE_NAME = "com.android.app";
+    private static final String INITIATING_PACKAGE_NAME = "com.android.vending";
     private static final String USAGE_PERCENT = "16%";
     private static final int ICON_ID = 123;
     private static final int UID = 1;
@@ -100,39 +100,43 @@
     private static final long FOREGROUND_SERVICE_TIME_MS = 123;
     private static final long BACKGROUND_TIME_MS = 100;
     private static final long SCREEN_ON_TIME_MS = 321;
-    private static final String KEY_ALLOW_BACKGROUND_USAGE = "allow_background_usage";
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private FragmentActivity mActivity;
 
     @Mock private EntityHeaderController mEntityHeaderController;
-    @Mock private LayoutPreference mHeaderPreference;
     @Mock private ApplicationsState mState;
     @Mock private ApplicationsState.AppEntry mAppEntry;
     @Mock private BatteryEntry mBatteryEntry;
     @Mock private PackageManager mPackageManager;
     @Mock private InstallSourceInfo mInstallSourceInfo;
+    @Mock private LayoutPreference mLayoutPreference;
     @Mock private AppOpsManager mAppOpsManager;
     @Mock private LoaderManager mLoaderManager;
-    @Mock private BatteryOptimizeUtils mBatteryOptimizeUtils;
 
+    private int mTestMode;
     private Context mContext;
-    private PrimarySwitchPreference mAllowBackgroundUsagePreference;
     private AdvancedPowerUsageDetail mFragment;
     private SettingsActivity mTestActivity;
     private FakeFeatureFactory mFeatureFactory;
     private MetricsFeatureProvider mMetricsFeatureProvider;
     private BatteryDiffEntry mBatteryDiffEntry;
     private Bundle mBundle;
+    private BatteryOptimizeUtils mBatteryOptimizeUtils;
 
     @Before
-    public void setUp() {
+    public void setUp() throws Exception {
         mContext = spy(ApplicationProvider.getApplicationContext());
-        when(mContext.getPackageName()).thenReturn("foo");
+        when(mContext.getPackageName()).thenReturn(PACKAGE_NAME);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+        when(mPackageManager.getInstallSourceInfo(anyString())).thenReturn(mInstallSourceInfo);
         mFeatureFactory = FakeFeatureFactory.setupForTest();
         mMetricsFeatureProvider = mFeatureFactory.metricsFeatureProvider;
 
+        prepareTestBatteryOptimizationUtils();
         mFragment = spy(new AdvancedPowerUsageDetail());
+        mFragment.mBatteryOptimizeUtils = mBatteryOptimizeUtils;
+        doReturn(mLayoutPreference).when(mFragment).findPreference(any());
         mBundle = spy(new Bundle());
         doReturn(mContext).when(mFragment).getContext();
         doReturn(mActivity).when(mFragment).getActivity();
@@ -195,7 +199,6 @@
         when(mBatteryDiffEntry.getAppLabel()).thenReturn(APP_LABEL);
         when(mBatteryDiffEntry.getAppIconId()).thenReturn(ICON_ID);
 
-        mFragment.mHeaderPreference = mHeaderPreference;
         mFragment.mState = mState;
         mFragment.mBatteryOptimizeUtils = mBatteryOptimizeUtils;
         mFragment.mLogStringBuilder = new StringBuilder();
@@ -219,10 +222,6 @@
                 .startActivityAsUser(captor.capture(), nullable(UserHandle.class));
         doAnswer(callable).when(mActivity).startActivity(captor.capture());
         doAnswer(callable).when(mContext).startActivity(captor.capture());
-
-        mAllowBackgroundUsagePreference = new PrimarySwitchPreference(mContext);
-        mAllowBackgroundUsagePreference.setKey(KEY_ALLOW_BACKGROUND_USAGE);
-        mFragment.mAllowBackgroundUsagePreference = mAllowBackgroundUsagePreference;
     }
 
     @After
@@ -320,17 +319,15 @@
                 .isEqualTo(SCREEN_ON_TIME_MS);
         assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_PERCENT))
                 .isEqualTo(USAGE_PERCENT);
-        assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_SLOT_TIME))
-                .isEqualTo(null);
+        assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_SLOT_TIME)).isNull();
     }
 
-
     @Test
     public void startBatteryDetailPage_noBatteryUsage_hasBasicData() {
         final ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
 
         AdvancedPowerUsageDetail.startBatteryDetailPage(
-                mActivity, mFragment, PACKAGE_NAME[0], UserHandle.OWNER);
+                mActivity, mFragment, PACKAGE_NAME, UserHandle.OWNER);
 
         verify(mActivity).startActivity(captor.capture());
 
@@ -338,7 +335,7 @@
                         captor.getValue()
                                 .getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS)
                                 .getString(AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME))
-                .isEqualTo(PACKAGE_NAME[0]);
+                .isEqualTo(PACKAGE_NAME);
 
         assertThat(
                         captor.getValue()
@@ -351,62 +348,21 @@
     public void startBatteryDetailPage_batteryEntryNotExisted_extractUidFromPackageName()
             throws PackageManager.NameNotFoundException {
         mBundle.clear();
-        doReturn(UID).when(mPackageManager).getPackageUid(PACKAGE_NAME[0], 0 /* no flag */);
+        doReturn(UID).when(mPackageManager).getPackageUid(PACKAGE_NAME, 0 /* no flag */);
 
         AdvancedPowerUsageDetail.startBatteryDetailPage(
-                mActivity, mFragment, PACKAGE_NAME[0], UserHandle.OWNER);
+                mActivity, mFragment, PACKAGE_NAME, UserHandle.OWNER);
 
         assertThat(mBundle.getInt(AdvancedPowerUsageDetail.EXTRA_UID)).isEqualTo(UID);
     }
 
     @Test
-    public void initFooter_isValidPackageName_hasCorrectString() {
-        when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(true);
+    public void onPause_optimizationModeIsChanged_logPreference() throws Exception {
+        mFragment.mOptimizationMode = BatteryOptimizeUtils.MODE_RESTRICTED;
+        when(mBatteryOptimizeUtils.getPackageName()).thenReturn(PACKAGE_NAME);
+        when(mInstallSourceInfo.getInitiatingPackageName()).thenReturn(INITIATING_PACKAGE_NAME);
 
-        mFragment.initFooter();
-
-        assertThat(mAllowBackgroundUsagePreference.getSummary().toString())
-                .isEqualTo("This app requires optimized battery usage.");
-    }
-
-    @Test
-    public void initFooter_isSystemOrDefaultApp_hasCorrectString() {
-        when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(false);
-        when(mBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(true);
-
-        mFragment.initFooter();
-
-        assertThat(mAllowBackgroundUsagePreference.getSummary().toString())
-                .isEqualTo("This app requires unrestricted battery usage.");
-    }
-
-    @Test
-    public void initFooter_hasCorrectString() {
-        when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(false);
-        when(mBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(false);
-
-        mFragment.initFooter();
-
-        assertThat(mAllowBackgroundUsagePreference.getSummary().toString())
-                .isEqualTo("Enable for real-time updates, disable to save battery");
-    }
-
-    @Test
-    public void onPause_optimizationModeChanged_logPreference()
-            throws PackageManager.NameNotFoundException, InterruptedException {
-        final String packageName = "testPackageName";
-        final int restrictedMode = BatteryOptimizeUtils.MODE_RESTRICTED;
-        final int optimizedMode = BatteryOptimizeUtils.MODE_OPTIMIZED;
-        mFragment.mOptimizationMode = restrictedMode;
-        when(mBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(restrictedMode);
-        when(mBatteryOptimizeUtils.getPackageName()).thenReturn(packageName);
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
-        when(mPackageManager.getInstallSourceInfo(anyString())).thenReturn(mInstallSourceInfo);
-        when(mInstallSourceInfo.getInitiatingPackageName()).thenReturn("com.android.vending");
-
-        mFragment.onPreferenceChange(mAllowBackgroundUsagePreference, true);
-        verify(mBatteryOptimizeUtils).setAppUsageState(optimizedMode, Action.APPLY);
-        when(mBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(optimizedMode);
+        mBatteryOptimizeUtils.setAppUsageState(BatteryOptimizeUtils.MODE_OPTIMIZED, Action.APPLY);
         mFragment.onPause();
 
         TimeUnit.SECONDS.sleep(1);
@@ -415,27 +371,18 @@
                         SettingsEnums.LEAVE_APP_BATTERY_USAGE,
                         SettingsEnums.ACTION_APP_BATTERY_USAGE_ALLOW_BACKGROUND,
                         SettingsEnums.FUELGAUGE_POWER_USAGE_DETAIL,
-                        packageName,
+                        PACKAGE_NAME,
                         /* consumed battery */ 0);
     }
 
     @Test
-    public void onPause_optimizationModeIsNotChanged_notInvokeLogging()
-            throws PackageManager.NameNotFoundException, InterruptedException {
-        final int restrictedMode = BatteryOptimizeUtils.MODE_RESTRICTED;
-        final int optimizedMode = BatteryOptimizeUtils.MODE_OPTIMIZED;
-        mFragment.mOptimizationMode = restrictedMode;
-        when(mBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(restrictedMode);
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
-        when(mPackageManager.getInstallSourceInfo(anyString())).thenReturn(mInstallSourceInfo);
-        when(mInstallSourceInfo.getInitiatingPackageName()).thenReturn("com.android.vending");
+    public void onPause_optimizationModeIsNotChanged_notInvokeLogging() throws Exception {
+        mFragment.mOptimizationMode = BatteryOptimizeUtils.MODE_RESTRICTED;
+        when(mBatteryOptimizeUtils.getPackageName()).thenReturn(PACKAGE_NAME);
+        when(mInstallSourceInfo.getInitiatingPackageName()).thenReturn(INITIATING_PACKAGE_NAME);
 
-        mFragment.onPreferenceChange(mAllowBackgroundUsagePreference, true);
-        verify(mBatteryOptimizeUtils).setAppUsageState(optimizedMode, Action.APPLY);
-        when(mBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(optimizedMode);
-        mFragment.onPreferenceChange(mAllowBackgroundUsagePreference, false);
-        verify(mBatteryOptimizeUtils).setAppUsageState(restrictedMode, Action.APPLY);
-        when(mBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(restrictedMode);
+        mBatteryOptimizeUtils.setAppUsageState(BatteryOptimizeUtils.MODE_OPTIMIZED, Action.APPLY);
+        mBatteryOptimizeUtils.setAppUsageState(BatteryOptimizeUtils.MODE_RESTRICTED, Action.APPLY);
         mFragment.onPause();
 
         TimeUnit.SECONDS.sleep(1);
@@ -446,4 +393,16 @@
     public void shouldSkipForInitialSUW_returnTrue() {
         assertThat(mFragment.shouldSkipForInitialSUW()).isTrue();
     }
+
+    private void prepareTestBatteryOptimizationUtils() {
+        mBatteryOptimizeUtils = spy(new BatteryOptimizeUtils(mContext, UID, PACKAGE_NAME));
+        Answer<Void> setTestMode =
+                invocation -> {
+                    mTestMode = invocation.getArgument(0);
+                    return null;
+                };
+        doAnswer(setTestMode).when(mBatteryOptimizeUtils).setAppUsageState(anyInt(), any());
+        Answer<Integer> getTestMode = invocation -> mTestMode;
+        doAnswer(getTestMode).when(mBatteryOptimizeUtils).getAppOptimizationMode();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AllowBackgroundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AllowBackgroundPreferenceControllerTest.java
deleted file mode 100644
index 261a315..0000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/AllowBackgroundPreferenceControllerTest.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (C) 2023 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;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-
-import com.android.settingslib.widget.MainSwitchPreference;
-
-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 org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class AllowBackgroundPreferenceControllerTest {
-    private static final int UID = 12345;
-    private static final String PACKAGE_NAME = "com.android.app";
-
-    private AllowBackgroundPreferenceController mController;
-    private MainSwitchPreference mMainSwitchPreference;
-    private BatteryOptimizeUtils mBatteryOptimizeUtils;
-
-    @Mock private PackageManager mMockPackageManager;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-
-        Context context = spy(RuntimeEnvironment.application);
-        BatteryUtils.getInstance(context).reset();
-        doReturn(UID)
-                .when(mMockPackageManager)
-                .getPackageUid(PACKAGE_NAME, PackageManager.GET_META_DATA);
-
-        mController = new AllowBackgroundPreferenceController(context, UID, PACKAGE_NAME);
-        mMainSwitchPreference = new MainSwitchPreference(RuntimeEnvironment.application);
-        mBatteryOptimizeUtils = spy(new BatteryOptimizeUtils(context, UID, PACKAGE_NAME));
-        mController.mBatteryOptimizeUtils = mBatteryOptimizeUtils;
-    }
-
-    @Test
-    public void testUpdateState_isValidPackage_prefEnabled() {
-        when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(false);
-        when(mBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(false);
-
-        mController.updateState(mMainSwitchPreference);
-
-        assertThat(mBatteryOptimizeUtils.isOptimizeModeMutable()).isTrue();
-        assertThat(mMainSwitchPreference.isEnabled()).isTrue();
-    }
-
-    @Test
-    public void testUpdateState_invalidPackage_prefDisabled() {
-        when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(true);
-        when(mBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(false);
-
-        mController.updateState(mMainSwitchPreference);
-
-        assertThat(mBatteryOptimizeUtils.isOptimizeModeMutable()).isFalse();
-        assertThat(mMainSwitchPreference.isEnabled()).isFalse();
-    }
-
-    @Test
-    public void testUpdateState_isSystemOrDefaultAppAndRestrictedStates_prefChecked() {
-        when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(false);
-        when(mBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(true);
-        when(mBatteryOptimizeUtils.getAppOptimizationMode())
-                .thenReturn(BatteryOptimizeUtils.MODE_RESTRICTED);
-
-        mController.updateState(mMainSwitchPreference);
-
-        assertThat(mMainSwitchPreference.isEnabled()).isFalse();
-        assertThat(mMainSwitchPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void testUpdateState_isSystemOrDefaultApp_prefUnchecked() {
-        when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(false);
-        when(mBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(true);
-        when(mBatteryOptimizeUtils.getAppOptimizationMode())
-                .thenReturn(BatteryOptimizeUtils.MODE_OPTIMIZED);
-
-        mController.updateState(mMainSwitchPreference);
-
-        assertThat(mMainSwitchPreference.isEnabled()).isFalse();
-        assertThat(mMainSwitchPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void testUpdateState_isRestrictedStates_prefChecked() {
-        when(mBatteryOptimizeUtils.isOptimizeModeMutable()).thenReturn(true);
-        when(mBatteryOptimizeUtils.getAppOptimizationMode())
-                .thenReturn(BatteryOptimizeUtils.MODE_RESTRICTED);
-
-        mController.updateState(mMainSwitchPreference);
-
-        assertThat(mMainSwitchPreference.isEnabled()).isTrue();
-        assertThat(mMainSwitchPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void testUpdateState_prefUnchecked() {
-        when(mBatteryOptimizeUtils.isOptimizeModeMutable()).thenReturn(true);
-        when(mBatteryOptimizeUtils.getAppOptimizationMode())
-                .thenReturn(BatteryOptimizeUtils.MODE_OPTIMIZED);
-
-        mController.updateState(mMainSwitchPreference);
-
-        assertThat(mMainSwitchPreference.isEnabled()).isTrue();
-        assertThat(mMainSwitchPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void testHandlePreferenceTreeClick_samePrefKey_verifyAction() {
-        mMainSwitchPreference.setKey(
-                AllowBackgroundPreferenceController.KEY_ALLOW_BACKGROUND_USAGE);
-        mController.handlePreferenceTreeClick(mMainSwitchPreference);
-
-        assertThat(mController.handlePreferenceTreeClick(mMainSwitchPreference)).isTrue();
-    }
-
-    @Test
-    public void testHandlePreferenceTreeClick_incorrectPrefKey_noAction() {
-        assertThat(mController.handlePreferenceTreeClick(mMainSwitchPreference)).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundUsageAllowabilityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundUsageAllowabilityPreferenceControllerTest.java
new file mode 100644
index 0000000..190446e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundUsageAllowabilityPreferenceControllerTest.java
@@ -0,0 +1,202 @@
+/*
+ * Copyright (C) 2024 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;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.fuelgauge.BatteryOptimizeHistoricalLogEntry.Action;
+import com.android.settingslib.PrimarySwitchPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.mockito.stubbing.Answer;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class BackgroundUsageAllowabilityPreferenceControllerTest {
+    private static final int UID = 12345;
+    private static final String PACKAGE_NAME = "com.android.app";
+
+    private int mTestMode;
+    private Context mContext;
+    private BackgroundUsageAllowabilityPreferenceController mBackgroundUsageController;
+    private BatteryOptimizeUtils mBatteryOptimizeUtils;
+
+    @Mock DashboardFragment mDashboardFragment;
+    @Mock PrimarySwitchPreference mBackgroundUsageAllowabilityPreference;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        prepareTestBatteryOptimizationUtils();
+        mBackgroundUsageController =
+                spy(
+                        new BackgroundUsageAllowabilityPreferenceController(
+                                mContext,
+                                mDashboardFragment,
+                                /* preferenceKey= */ "test",
+                                mBatteryOptimizeUtils));
+        mBackgroundUsageController.mBackgroundUsageAllowabilityPreference =
+                mBackgroundUsageAllowabilityPreference;
+    }
+
+    @Test
+    public void initPreferences_immutableOptimized_setExpectedContent() {
+        doReturn(false).when(mBatteryOptimizeUtils).isOptimizeModeMutable();
+        doReturn(true).when(mBatteryOptimizeUtils).isDisabledForOptimizeModeOnly();
+
+        mBackgroundUsageController.initPreferences();
+
+        verify(mBackgroundUsageAllowabilityPreference).setEnabled(false);
+        verify(mBackgroundUsageAllowabilityPreference).setSwitchEnabled(false);
+        verify(mBackgroundUsageAllowabilityPreference)
+                .setSummary(
+                        mContext.getString(
+                                R.string.manager_battery_usage_footer_limited,
+                                mContext.getString(R.string.manager_battery_usage_optimized_only)));
+        verify(mBackgroundUsageAllowabilityPreference, never())
+                .setOnPreferenceChangeListener(any());
+        verify(mBackgroundUsageAllowabilityPreference, never()).setOnPreferenceClickListener(any());
+    }
+
+    @Test
+    public void initPreferences_immutableUnrestricted_setExpectedContent() {
+        doReturn(false).when(mBatteryOptimizeUtils).isOptimizeModeMutable();
+        doReturn(false).when(mBatteryOptimizeUtils).isDisabledForOptimizeModeOnly();
+        doReturn(true).when(mBatteryOptimizeUtils).isSystemOrDefaultApp();
+
+        mBackgroundUsageController.initPreferences();
+
+        verify(mBackgroundUsageAllowabilityPreference).setEnabled(false);
+        verify(mBackgroundUsageAllowabilityPreference).setSwitchEnabled(false);
+        verify(mBackgroundUsageAllowabilityPreference)
+                .setSummary(
+                        mContext.getString(
+                                R.string.manager_battery_usage_footer_limited,
+                                mContext.getString(
+                                        R.string.manager_battery_usage_unrestricted_only)));
+        verify(mBackgroundUsageAllowabilityPreference, never())
+                .setOnPreferenceChangeListener(any());
+        verify(mBackgroundUsageAllowabilityPreference, never()).setOnPreferenceClickListener(any());
+    }
+
+    @Test
+    public void initPreferences_mutableMode_setExpectedContent() {
+        doReturn(true).when(mBatteryOptimizeUtils).isOptimizeModeMutable();
+        doReturn(false).when(mBatteryOptimizeUtils).isDisabledForOptimizeModeOnly();
+        doReturn(false).when(mBatteryOptimizeUtils).isSystemOrDefaultApp();
+
+        mBackgroundUsageController.initPreferences();
+
+        verify(mBackgroundUsageAllowabilityPreference).setEnabled(true);
+        verify(mBackgroundUsageAllowabilityPreference).setSwitchEnabled(true);
+        verify(mBackgroundUsageAllowabilityPreference)
+                .setSummary(
+                        mContext.getString(
+                                R.string.manager_battery_usage_allow_background_usage_summary));
+        verify(mBackgroundUsageAllowabilityPreference).setOnPreferenceChangeListener(any());
+        verify(mBackgroundUsageAllowabilityPreference).setOnPreferenceClickListener(any());
+    }
+
+    @Test
+    public void updatePreferences_setIntoUnrestrictedMode_setExpectedPrefStatus() {
+        mTestMode = BatteryOptimizeUtils.MODE_UNRESTRICTED;
+
+        mBackgroundUsageController.updatePreferences(mTestMode);
+
+        verifyPreferences(mTestMode);
+    }
+
+    @Test
+    public void updatePreferences_setIntoOptimizedMode_setExpectedPrefStatus() {
+        mTestMode = BatteryOptimizeUtils.MODE_OPTIMIZED;
+
+        mBackgroundUsageController.updatePreferences(mTestMode);
+
+        verifyPreferences(mTestMode);
+    }
+
+    @Test
+    public void updatePreferences_setIntoRestrictedMode_setExpectedPrefStatus() {
+        mTestMode = BatteryOptimizeUtils.MODE_RESTRICTED;
+
+        mBackgroundUsageController.updatePreferences(mTestMode);
+
+        verifyPreferences(mTestMode);
+    }
+
+    @Test
+    public void handleBatteryOptimizeModeUpdated_modeChange_setExpectedPrefStatus() {
+        mTestMode = BatteryOptimizeUtils.MODE_RESTRICTED;
+
+        mBackgroundUsageController.handleBatteryOptimizeModeUpdated(
+                BatteryOptimizeUtils.MODE_OPTIMIZED);
+
+        verify(mBatteryOptimizeUtils)
+                .setAppUsageState(BatteryOptimizeUtils.MODE_OPTIMIZED, Action.APPLY);
+        assertThat(mTestMode).isEqualTo(BatteryOptimizeUtils.MODE_OPTIMIZED);
+        verifyPreferences(mTestMode);
+    }
+
+    @Test
+    public void handleBatteryOptimizeModeUpdated_modeNotChange_setExpectedPrefStatus() {
+        mTestMode = BatteryOptimizeUtils.MODE_RESTRICTED;
+
+        mBackgroundUsageController.handleBatteryOptimizeModeUpdated(
+                BatteryOptimizeUtils.MODE_RESTRICTED);
+
+        verify(mBatteryOptimizeUtils, never()).setAppUsageState(anyInt(), any());
+        assertThat(mTestMode).isEqualTo(BatteryOptimizeUtils.MODE_RESTRICTED);
+        verify(mBackgroundUsageController, never()).updatePreferences(mTestMode);
+    }
+
+    private void prepareTestBatteryOptimizationUtils() {
+        mBatteryOptimizeUtils = spy(new BatteryOptimizeUtils(mContext, UID, PACKAGE_NAME));
+        Answer<Void> setTestMode =
+                invocation -> {
+                    mTestMode = invocation.getArgument(0);
+                    return null;
+                };
+        doAnswer(setTestMode).when(mBatteryOptimizeUtils).setAppUsageState(anyInt(), any());
+        Answer<Integer> getTestMode = invocation -> mTestMode;
+        doAnswer(getTestMode).when(mBatteryOptimizeUtils).getAppOptimizationMode();
+    }
+
+    private void verifyPreferences(int mode) {
+        boolean isAllowBackground = mode != BatteryOptimizeUtils.MODE_RESTRICTED;
+        verify(mBackgroundUsageAllowabilityPreference).setChecked(isAllowBackground);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationModePreferenceControllerTest.java
new file mode 100644
index 0000000..2ddc7eb
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationModePreferenceControllerTest.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright (C) 2024 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;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settingslib.widget.MainSwitchPreference;
+import com.android.settingslib.widget.SelectorWithWidgetPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.mockito.stubbing.Answer;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class BatteryOptimizationModePreferenceControllerTest {
+    private static final int UID = 12345;
+    private static final String PACKAGE_NAME = "com.android.app";
+
+    private int mTestMode;
+    private Context mContext;
+    private BatteryOptimizationModePreferenceController mBackgroundUsageController;
+    private BatteryOptimizeUtils mBatteryOptimizeUtils;
+
+    @Mock MainSwitchPreference mBackgroundUsageAllowabilityPreference;
+    @Mock SelectorWithWidgetPreference mOptimizedPreference;
+    @Mock SelectorWithWidgetPreference mUnrestrictedPreference;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        prepareTestBatteryOptimizationUtils();
+        mBackgroundUsageController =
+                spy(
+                        new BatteryOptimizationModePreferenceController(
+                                mContext, "test", mBatteryOptimizeUtils));
+        mBackgroundUsageController.mBackgroundUsageAllowabilityPreference =
+                mBackgroundUsageAllowabilityPreference;
+        mBackgroundUsageController.mOptimizedPreference = mOptimizedPreference;
+        mBackgroundUsageController.mUnrestrictedPreference = mUnrestrictedPreference;
+    }
+
+    @Test
+    public void initPreferences_mutableMode_setEnabled() {
+        doReturn(true).when(mBatteryOptimizeUtils).isOptimizeModeMutable();
+
+        mBackgroundUsageController.initPreferences();
+
+        verify(mBackgroundUsageAllowabilityPreference).setEnabled(true);
+        verify(mOptimizedPreference).setEnabled(true);
+        verify(mUnrestrictedPreference).setEnabled(true);
+        verify(mBackgroundUsageAllowabilityPreference, never()).setOnPreferenceClickListener(any());
+        verify(mBackgroundUsageAllowabilityPreference).setOnPreferenceChangeListener(any());
+        verify(mOptimizedPreference).setOnPreferenceClickListener(any());
+        verify(mUnrestrictedPreference).setOnPreferenceClickListener(any());
+    }
+
+    @Test
+    public void initPreferences_immutableMode_setDisabledAndSkipSetListeners() {
+        doReturn(false).when(mBatteryOptimizeUtils).isOptimizeModeMutable();
+
+        mBackgroundUsageController.initPreferences();
+
+        verify(mBackgroundUsageAllowabilityPreference).setEnabled(false);
+        verify(mOptimizedPreference).setEnabled(false);
+        verify(mUnrestrictedPreference).setEnabled(false);
+        verify(mBackgroundUsageAllowabilityPreference, never()).setOnPreferenceClickListener(any());
+        verify(mBackgroundUsageAllowabilityPreference, never())
+                .setOnPreferenceChangeListener(any());
+        verify(mOptimizedPreference, never()).setOnPreferenceClickListener(any());
+        verify(mUnrestrictedPreference, never()).setOnPreferenceClickListener(any());
+    }
+
+    @Test
+    public void updatePreferences_setIntoUnrestrictedMode_setExpectedPrefStatus() {
+        mTestMode = BatteryOptimizeUtils.MODE_UNRESTRICTED;
+
+        mBackgroundUsageController.updatePreferences(mTestMode);
+
+        verifyPreferences(mTestMode);
+    }
+
+    @Test
+    public void updatePreferences_setIntoOptimizedMode_setExpectedPrefStatus() {
+        mTestMode = BatteryOptimizeUtils.MODE_OPTIMIZED;
+
+        mBackgroundUsageController.updatePreferences(mTestMode);
+
+        verifyPreferences(mTestMode);
+    }
+
+    @Test
+    public void updatePreferences_setIntoRestrictedMode_setExpectedPrefStatus() {
+        mTestMode = BatteryOptimizeUtils.MODE_RESTRICTED;
+
+        mBackgroundUsageController.updatePreferences(mTestMode);
+
+        verifyPreferences(mTestMode);
+    }
+
+    @Test
+    public void handleBatteryOptimizeModeUpdated_modeChange_setExpectedPrefStatus() {
+        mTestMode = BatteryOptimizeUtils.MODE_RESTRICTED;
+
+        mBackgroundUsageController.handleBatteryOptimizeModeUpdated(
+                BatteryOptimizeUtils.MODE_OPTIMIZED);
+
+        verify(mBatteryOptimizeUtils)
+                .setAppUsageState(
+                        BatteryOptimizeUtils.MODE_OPTIMIZED,
+                        BatteryOptimizeHistoricalLogEntry.Action.APPLY);
+        assertThat(mTestMode).isEqualTo(BatteryOptimizeUtils.MODE_OPTIMIZED);
+        verifyPreferences(mBatteryOptimizeUtils.getAppOptimizationMode());
+    }
+
+    @Test
+    public void handleBatteryOptimizeModeUpdated_modeNotChange_setExpectedPrefStatus() {
+        mTestMode = BatteryOptimizeUtils.MODE_RESTRICTED;
+
+        mBackgroundUsageController.handleBatteryOptimizeModeUpdated(
+                BatteryOptimizeUtils.MODE_RESTRICTED);
+
+        verify(mBatteryOptimizeUtils, never()).setAppUsageState(anyInt(), any());
+        assertThat(mTestMode).isEqualTo(BatteryOptimizeUtils.MODE_RESTRICTED);
+        verify(mBackgroundUsageController, never()).updatePreferences(anyInt());
+    }
+
+    private void prepareTestBatteryOptimizationUtils() {
+        mBatteryOptimizeUtils = spy(new BatteryOptimizeUtils(mContext, UID, PACKAGE_NAME));
+        Answer<Void> setTestMode =
+                invocation -> {
+                    mTestMode = invocation.getArgument(0);
+                    return null;
+                };
+        doAnswer(setTestMode).when(mBatteryOptimizeUtils).setAppUsageState(anyInt(), any());
+        Answer<Integer> getTestMode = invocation -> mTestMode;
+        doAnswer(getTestMode).when(mBatteryOptimizeUtils).getAppOptimizationMode();
+    }
+
+    private void verifyPreferences(int mode) {
+        boolean isAllowBackground = mode != BatteryOptimizeUtils.MODE_RESTRICTED;
+        verify(mBackgroundUsageAllowabilityPreference).setChecked(isAllowBackground);
+        verify(mOptimizedPreference).setEnabled(isAllowBackground);
+        verify(mUnrestrictedPreference).setEnabled(isAllowBackground);
+        verify(mOptimizedPreference).setChecked(mode == BatteryOptimizeUtils.MODE_OPTIMIZED);
+        verify(mUnrestrictedPreference).setChecked(mode == BatteryOptimizeUtils.MODE_UNRESTRICTED);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java
index 72b49e2..41e9dca 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java
@@ -128,6 +128,15 @@
     }
 
     @Test
+    public void testGetAppOptimizationMode_unknownMode_returnOptimized() throws Exception {
+        when(mMockBackend.isAllowlisted(anyString(), anyInt())).thenReturn(true);
+        when(mMockAppOpsManager.checkOpNoThrow(anyInt(), anyInt(), anyString()))
+                .thenReturn(AppOpsManager.MODE_IGNORED);
+
+        assertThat(mBatteryOptimizeUtils.getAppOptimizationMode()).isEqualTo(MODE_UNRESTRICTED);
+    }
+
+    @Test
     public void testIsSystemOrDefaultApp_isSystemOrDefaultApp_returnTrue() {
         when(mMockBackend.isAllowlisted(anyString(), anyInt())).thenReturn(true);
         when(mMockBackend.isDefaultActiveApp(anyString(), anyInt())).thenReturn(true);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/OptimizedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/OptimizedPreferenceControllerTest.java
deleted file mode 100644
index 6656471..0000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/OptimizedPreferenceControllerTest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * 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.fuelgauge;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-
-import com.android.settingslib.widget.SelectorWithWidgetPreference;
-
-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 org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class OptimizedPreferenceControllerTest {
-    private static final int UID = 12345;
-    private static final String PACKAGE_NAME = "com.android.app";
-
-    private OptimizedPreferenceController mController;
-    private SelectorWithWidgetPreference mPreference;
-    private BatteryOptimizeUtils mBatteryOptimizeUtils;
-
-    @Mock PackageManager mMockPackageManager;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-
-        Context context = spy(RuntimeEnvironment.application);
-        BatteryUtils.getInstance(context).reset();
-        doReturn(UID)
-                .when(mMockPackageManager)
-                .getPackageUid(PACKAGE_NAME, PackageManager.GET_META_DATA);
-
-        mController = new OptimizedPreferenceController(context, UID, PACKAGE_NAME);
-        mPreference = new SelectorWithWidgetPreference(RuntimeEnvironment.application);
-        mBatteryOptimizeUtils = spy(new BatteryOptimizeUtils(context, UID, PACKAGE_NAME));
-        mController.mBatteryOptimizeUtils = mBatteryOptimizeUtils;
-    }
-
-    @Test
-    public void testUpdateState_invalidPackage_prefEnabled() {
-        when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(true);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isEnabled()).isFalse();
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void testUpdateState_isSystemOrDefaultAppAndOptimizeStates_prefChecked() {
-        when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(false);
-        when(mBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(true);
-        when(mBatteryOptimizeUtils.getAppOptimizationMode())
-                .thenReturn(BatteryOptimizeUtils.MODE_OPTIMIZED);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void testUpdateState_isSystemOrDefaultApp_prefUnchecked() {
-        when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(false);
-        when(mBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(true);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isChecked()).isFalse();
-        assertThat(mPreference.isEnabled()).isFalse();
-    }
-
-    @Test
-    public void testUpdateState_isOptimizedStates_prefChecked() {
-        when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(false);
-        when(mBatteryOptimizeUtils.getAppOptimizationMode())
-                .thenReturn(BatteryOptimizeUtils.MODE_OPTIMIZED);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void testUpdateState_prefUnchecked() {
-        when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(false);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void testHandlePreferenceTreeClick_samePrefKey_verifyAction() {
-        mPreference.setKey(mController.KEY_OPTIMIZED_PREF);
-        mController.handlePreferenceTreeClick(mPreference);
-
-        assertThat(mController.handlePreferenceTreeClick(mPreference)).isTrue();
-    }
-
-    @Test
-    public void testHandlePreferenceTreeClick_incorrectPrefKey_noAction() {
-        assertThat(mController.handlePreferenceTreeClick(mPreference)).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetailTest.java
index 9061117..9f98d78 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetailTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetailTest.java
@@ -17,10 +17,10 @@
 package com.android.settings.fuelgauge;
 
 import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS;
-import static com.android.settings.fuelgauge.BatteryOptimizeHistoricalLogEntry.Action;
 
 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.anyString;
 import static org.mockito.ArgumentMatchers.nullable;
@@ -42,16 +42,17 @@
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.UserHandle;
-import android.widget.CompoundButton;
 
 import androidx.fragment.app.FragmentActivity;
 import androidx.loader.app.LoaderManager;
 import androidx.test.core.app.ApplicationProvider;
 
+import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.fuelgauge.batteryusage.BatteryEntry;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
+import com.android.settings.testutils.shadow.ShadowHelpUtils;
 import com.android.settings.widget.EntityHeaderController;
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState;
@@ -59,8 +60,6 @@
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.widget.FooterPreference;
 import com.android.settingslib.widget.LayoutPreference;
-import com.android.settingslib.widget.MainSwitchPreference;
-import com.android.settingslib.widget.SelectorWithWidgetPreference;
 
 import org.junit.After;
 import org.junit.Before;
@@ -83,36 +82,33 @@
 @Config(
         shadows = {
             ShadowEntityHeaderController.class,
+            ShadowHelpUtils.class,
             com.android.settings.testutils.shadow.ShadowFragment.class,
         })
 public class PowerBackgroundUsageDetailTest {
 
-    @Rule
-    public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+    @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
 
     private static final String APP_LABEL = "app label";
     private static final String SUMMARY = "summary";
     private static final int ICON_ID = 123;
     private static final int UID = 1;
-    private static final String KEY_PREF_UNRESTRICTED = "unrestricted_preference";
-    private static final String KEY_PREF_OPTIMIZED = "optimized_preference";
-    private static final String KEY_ALLOW_BACKGROUND_USAGE = "allow_background_usage";
+    private static final String PACKAGE_NAME = "com.android.app";
+    private static final String KEY_PREF_HEADER = "header_view";
+    private static final String KEY_FOOTER_PREFERENCE = "app_usage_footer_preference";
+    private static final String INITIATING_PACKAGE_NAME = "com.android.vending";
 
+    private int mTestMode;
     private Context mContext;
     private PowerBackgroundUsageDetail mFragment;
-    private FooterPreference mFooterPreference;
-    private MainSwitchPreference mMainSwitchPreference;
     private MetricsFeatureProvider mMetricsFeatureProvider;
-    private SelectorWithWidgetPreference mOptimizePreference;
-    private SelectorWithWidgetPreference mUnrestrictedPreference;
     private SettingsActivity mTestActivity;
+    private BatteryOptimizeUtils mBatteryOptimizeUtils;
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private FragmentActivity mActivity;
 
     @Mock private EntityHeaderController mEntityHeaderController;
-    @Mock private BatteryOptimizeUtils mBatteryOptimizeUtils;
-    @Mock private LayoutPreference mHeaderPreference;
     @Mock private ApplicationsState mState;
     @Mock private Bundle mBundle;
     @Mock private LoaderManager mLoaderManager;
@@ -120,21 +116,26 @@
     @Mock private BatteryEntry mBatteryEntry;
     @Mock private PackageManager mPackageManager;
     @Mock private AppOpsManager mAppOpsManager;
-    @Mock private CompoundButton mMockSwitch;
     @Mock private InstallSourceInfo mInstallSourceInfo;
+    @Mock private LayoutPreference mLayoutPreference;
+    @Mock private FooterPreference mFooterPreference;
 
     @Before
     public void setUp() throws Exception {
         mContext = spy(ApplicationProvider.getApplicationContext());
-        when(mContext.getPackageName()).thenReturn("foo");
+        when(mContext.getPackageName()).thenReturn(PACKAGE_NAME);
         when(mContext.getPackageManager()).thenReturn(mPackageManager);
         when(mPackageManager.getInstallSourceInfo(anyString())).thenReturn(mInstallSourceInfo);
 
         final FakeFeatureFactory fakeFeatureFactory = FakeFeatureFactory.setupForTest();
         mMetricsFeatureProvider = fakeFeatureFactory.metricsFeatureProvider;
 
+        prepareTestBatteryOptimizationUtils();
         mFragment = spy(new PowerBackgroundUsageDetail());
+        mFragment.mBatteryOptimizeUtils = mBatteryOptimizeUtils;
         mFragment.mLogStringBuilder = new StringBuilder();
+        doReturn(mLayoutPreference).when(mFragment).findPreference(KEY_PREF_HEADER);
+        doReturn(mFooterPreference).when(mFragment).findPreference(KEY_FOOTER_PREFERENCE);
         doReturn(mContext).when(mFragment).getContext();
         doReturn(mActivity).when(mFragment).getActivity();
         doReturn(SUMMARY).when(mFragment).getString(anyInt());
@@ -169,9 +170,7 @@
         when(mBatteryEntry.getLabel()).thenReturn(APP_LABEL);
         mBatteryEntry.mIconId = ICON_ID;
 
-        mFragment.mHeaderPreference = mHeaderPreference;
         mFragment.mState = mState;
-        mFragment.mBatteryOptimizeUtils = mBatteryOptimizeUtils;
         mAppEntry.info = mock(ApplicationInfo.class);
 
         mTestActivity = spy(new SettingsActivity());
@@ -191,23 +190,12 @@
                 .when(mActivity)
                 .startActivityAsUser(captor.capture(), nullable(UserHandle.class));
         doAnswer(callable).when(mActivity).startActivity(captor.capture());
-
-        mFooterPreference = spy(new FooterPreference(mContext));
-        mMainSwitchPreference = spy(new MainSwitchPreference(mContext));
-        mMainSwitchPreference.setKey(KEY_ALLOW_BACKGROUND_USAGE);
-        mOptimizePreference = spy(new SelectorWithWidgetPreference(mContext));
-        mOptimizePreference.setKey(KEY_PREF_OPTIMIZED);
-        mUnrestrictedPreference = spy(new SelectorWithWidgetPreference(mContext));
-        mUnrestrictedPreference.setKey(KEY_PREF_UNRESTRICTED);
-        mFragment.mFooterPreference = mFooterPreference;
-        mFragment.mMainSwitchPreference = mMainSwitchPreference;
-        mFragment.mOptimizePreference = mOptimizePreference;
-        mFragment.mUnrestrictedPreference = mUnrestrictedPreference;
     }
 
     @After
     public void reset() {
         ShadowEntityHeaderController.reset();
+        ShadowHelpUtils.reset();
     }
 
     @Test
@@ -258,91 +246,64 @@
     }
 
     @Test
-    public void initFooter_hasCorrectString() {
-        when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(false);
-        when(mBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(false);
-
+    public void initFooter_setExpectedFooterContent() {
         mFragment.initFooter();
 
-        assertThat(mFooterPreference.getTitle().toString())
-                .isEqualTo("Changing how an app uses your battery can affect its performance.");
+        verify(mFooterPreference)
+                .setTitle(mContext.getString(R.string.manager_battery_usage_footer));
+        verify(mFooterPreference).setLearnMoreAction(any());
+        verify(mFooterPreference)
+                .setLearnMoreText(mContext.getString(R.string.manager_battery_usage_link_a11y));
     }
 
     @Test
-    public void onSwitchChanged_fromUnrestrictedModeSetDisabled_becomeRestrictedMode() {
-        final int restrictedMode = BatteryOptimizeUtils.MODE_RESTRICTED;
-        final int optimizedMode = BatteryOptimizeUtils.MODE_OPTIMIZED;
-        mFragment.mOptimizationMode = optimizedMode;
+    public void onPause_optimizationModeIsChanged_logPreference() throws Exception {
+        mFragment.mOptimizationMode = BatteryOptimizeUtils.MODE_OPTIMIZED;
+        when(mBatteryOptimizeUtils.getPackageName()).thenReturn(PACKAGE_NAME);
+        when(mInstallSourceInfo.getInitiatingPackageName()).thenReturn(INITIATING_PACKAGE_NAME);
 
-        mFragment.onCheckedChanged(mMockSwitch, /* isChecked= */ false);
-
-        verify(mOptimizePreference).setEnabled(false);
-        verify(mUnrestrictedPreference).setEnabled(false);
-        verify(mFragment).onRadioButtonClicked(null);
-        verify(mMainSwitchPreference).setChecked(false);
-        assertThat(mFragment.getSelectedPreference()).isEqualTo(restrictedMode);
-        verify(mBatteryOptimizeUtils).setAppUsageState(restrictedMode, Action.APPLY);
-    }
-
-    @Test
-    public void onSwitchChanged_fromRestrictedModeSetEnabled_becomeOptimizedMode() {
-        final int restrictedMode = BatteryOptimizeUtils.MODE_RESTRICTED;
-        final int optimizedMode = BatteryOptimizeUtils.MODE_OPTIMIZED;
-        mFragment.mOptimizationMode = restrictedMode;
-
-        mFragment.onCheckedChanged(mMockSwitch, /* isChecked= */ true);
-
-        verify(mOptimizePreference).setEnabled(true);
-        verify(mUnrestrictedPreference).setEnabled(true);
-        verify(mFragment).onRadioButtonClicked(mOptimizePreference);
-        verify(mMainSwitchPreference).setChecked(true);
-        verify(mOptimizePreference).setChecked(true);
-        assertThat(mFragment.getSelectedPreference()).isEqualTo(optimizedMode);
-        verify(mBatteryOptimizeUtils).setAppUsageState(optimizedMode, Action.APPLY);
-    }
-
-    @Test
-    public void onPause_optimizationModeChanged_logPreference() throws Exception {
-        final String packageName = "testPackageName";
-        final int restrictedMode = BatteryOptimizeUtils.MODE_RESTRICTED;
-        final int optimizedMode = BatteryOptimizeUtils.MODE_OPTIMIZED;
-        mFragment.mOptimizationMode = restrictedMode;
-        when(mBatteryOptimizeUtils.getPackageName()).thenReturn(packageName);
-        when(mInstallSourceInfo.getInitiatingPackageName()).thenReturn("com.android.vending");
-
-        mFragment.onCheckedChanged(mMockSwitch, /* isChecked= */ true);
-        verify(mBatteryOptimizeUtils).setAppUsageState(optimizedMode, Action.APPLY);
-        when(mBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(optimizedMode);
+        mTestMode = BatteryOptimizeUtils.MODE_UNRESTRICTED;
+        assertThat(mBatteryOptimizeUtils.getAppOptimizationMode())
+                .isEqualTo(BatteryOptimizeUtils.MODE_UNRESTRICTED);
         mFragment.onPause();
 
         TimeUnit.SECONDS.sleep(1);
         verify(mMetricsFeatureProvider)
                 .action(
                         SettingsEnums.LEAVE_POWER_USAGE_MANAGE_BACKGROUND,
-                        SettingsEnums.ACTION_APP_BATTERY_USAGE_OPTIMIZED,
+                        SettingsEnums.ACTION_APP_BATTERY_USAGE_UNRESTRICTED,
                         SettingsEnums.FUELGAUGE_POWER_USAGE_MANAGE_BACKGROUND,
-                        packageName,
+                        PACKAGE_NAME,
                         /* consumed battery */ 0);
     }
 
     @Test
     public void onPause_optimizationModeIsNotChanged_notInvokeLogging() throws Exception {
-        final String packageName = "testPackageName";
-        final int restrictedMode = BatteryOptimizeUtils.MODE_RESTRICTED;
-        final int optimizedMode = BatteryOptimizeUtils.MODE_OPTIMIZED;
-        mFragment.mOptimizationMode = restrictedMode;
-        when(mBatteryOptimizeUtils.getPackageName()).thenReturn(packageName);
-        when(mInstallSourceInfo.getInitiatingPackageName()).thenReturn("com.android.vending");
+        mFragment.mOptimizationMode = BatteryOptimizeUtils.MODE_OPTIMIZED;
+        when(mBatteryOptimizeUtils.getPackageName()).thenReturn(PACKAGE_NAME);
+        when(mInstallSourceInfo.getInitiatingPackageName()).thenReturn(INITIATING_PACKAGE_NAME);
 
-        mFragment.onCheckedChanged(mMockSwitch, /* isChecked= */ true);
-        verify(mBatteryOptimizeUtils).setAppUsageState(optimizedMode, Action.APPLY);
-        when(mBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(optimizedMode);
-        mFragment.onCheckedChanged(mMockSwitch, /* isChecked= */ false);
-        verify(mBatteryOptimizeUtils).setAppUsageState(restrictedMode, Action.APPLY);
-        when(mBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(restrictedMode);
+        mTestMode = BatteryOptimizeUtils.MODE_UNRESTRICTED;
+        assertThat(mBatteryOptimizeUtils.getAppOptimizationMode())
+                .isEqualTo(BatteryOptimizeUtils.MODE_UNRESTRICTED);
+        mTestMode = BatteryOptimizeUtils.MODE_OPTIMIZED;
+        assertThat(mBatteryOptimizeUtils.getAppOptimizationMode())
+                .isEqualTo(BatteryOptimizeUtils.MODE_OPTIMIZED);
         mFragment.onPause();
 
         TimeUnit.SECONDS.sleep(1);
         verifyNoInteractions(mMetricsFeatureProvider);
     }
+
+    private void prepareTestBatteryOptimizationUtils() {
+        mBatteryOptimizeUtils = spy(new BatteryOptimizeUtils(mContext, UID, PACKAGE_NAME));
+        Answer<Void> setTestMode =
+                invocation -> {
+                    mTestMode = invocation.getArgument(0);
+                    return null;
+                };
+        doAnswer(setTestMode).when(mBatteryOptimizeUtils).setAppUsageState(anyInt(), any());
+        Answer<Integer> getTestMode = invocation -> mTestMode;
+        doAnswer(getTestMode).when(mBatteryOptimizeUtils).getAppOptimizationMode();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/UnrestrictedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/UnrestrictedPreferenceControllerTest.java
deleted file mode 100644
index 0c6f7da..0000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/UnrestrictedPreferenceControllerTest.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * 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.fuelgauge;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-
-import com.android.settingslib.widget.SelectorWithWidgetPreference;
-
-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 org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class UnrestrictedPreferenceControllerTest {
-    private static final int UID = 12345;
-    private static final String PACKAGE_NAME = "com.android.app";
-
-    private UnrestrictedPreferenceController mController;
-    private SelectorWithWidgetPreference mPreference;
-    private BatteryOptimizeUtils mBatteryOptimizeUtils;
-
-    @Mock PackageManager mMockPackageManager;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-
-        Context context = spy(RuntimeEnvironment.application);
-        BatteryUtils.getInstance(context).reset();
-        doReturn(UID)
-                .when(mMockPackageManager)
-                .getPackageUid(PACKAGE_NAME, PackageManager.GET_META_DATA);
-
-        mController = new UnrestrictedPreferenceController(context, UID, PACKAGE_NAME);
-        mPreference = new SelectorWithWidgetPreference(RuntimeEnvironment.application);
-        mBatteryOptimizeUtils = spy(new BatteryOptimizeUtils(context, UID, PACKAGE_NAME));
-        mController.mBatteryOptimizeUtils = mBatteryOptimizeUtils;
-    }
-
-    @Test
-    public void testUpdateState_isValidPackage_prefEnabled() {
-        when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(false);
-        when(mBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(false);
-
-        mController.updateState(mPreference);
-
-        assertThat(mBatteryOptimizeUtils.isOptimizeModeMutable()).isTrue();
-        assertThat(mPreference.isEnabled()).isTrue();
-    }
-
-    @Test
-    public void testUpdateState_invalidPackage_prefDisabled() {
-        when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(true);
-        when(mBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(false);
-
-        mController.updateState(mPreference);
-
-        assertThat(mBatteryOptimizeUtils.isOptimizeModeMutable()).isFalse();
-        assertThat(mPreference.isEnabled()).isFalse();
-    }
-
-    @Test
-    public void testUpdateState_isSystemOrDefaultAppAndUnrestrictedStates_prefChecked() {
-        when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(false);
-        when(mBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(true);
-        when(mBatteryOptimizeUtils.getAppOptimizationMode())
-                .thenReturn(BatteryOptimizeUtils.MODE_UNRESTRICTED);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void testUpdateState_isSystemOrDefaultApp_prefUnchecked() {
-        when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(false);
-        when(mBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(true);
-        when(mBatteryOptimizeUtils.getAppOptimizationMode())
-                .thenReturn(BatteryOptimizeUtils.MODE_OPTIMIZED);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isEnabled()).isFalse();
-        assertThat(mPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void testUpdateState_isUnrestrictedStates_prefChecked() {
-        when(mBatteryOptimizeUtils.isOptimizeModeMutable()).thenReturn(true);
-        when(mBatteryOptimizeUtils.getAppOptimizationMode())
-                .thenReturn(BatteryOptimizeUtils.MODE_UNRESTRICTED);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isEnabled()).isTrue();
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void testUpdateState_prefUnchecked() {
-        when(mBatteryOptimizeUtils.isOptimizeModeMutable()).thenReturn(true);
-        when(mBatteryOptimizeUtils.getAppOptimizationMode())
-                .thenReturn(BatteryOptimizeUtils.MODE_OPTIMIZED);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isEnabled()).isTrue();
-        assertThat(mPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void testHandlePreferenceTreeClick_samePrefKey_verifyAction() {
-        mPreference.setKey(mController.KEY_UNRESTRICTED_PREF);
-        mController.handlePreferenceTreeClick(mPreference);
-
-        assertThat(mController.handlePreferenceTreeClick(mPreference)).isTrue();
-    }
-
-    @Test
-    public void testHandlePreferenceTreeClick_incorrectPrefKey_noAction() {
-        assertThat(mController.handlePreferenceTreeClick(mPreference)).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScreenTest.kt b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScreenTest.kt
new file mode 100644
index 0000000..a034e52
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScreenTest.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2024 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.batterysaver
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.flags.Flags
+import com.android.settingslib.preference.CatalystScreenTestCase
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class BatterySaverScreenTest : CatalystScreenTestCase() {
+
+    override val preferenceScreenCreator = BatterySaverScreen()
+
+    override val flagName: String
+        get() = Flags.FLAG_CATALYST_BATTERY_SAVER_SCREEN
+
+    @Test
+    fun key() {
+        assertThat(preferenceScreenCreator.key).isEqualTo(BatterySaverScreen.KEY)
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryScreenTest.kt b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryScreenTest.kt
new file mode 100644
index 0000000..80a6b2e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryScreenTest.kt
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2024 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.batteryusage
+
+import android.content.ContextWrapper
+import android.content.res.Resources
+import android.platform.test.annotations.DisableFlags
+import android.platform.test.annotations.EnableFlags
+import androidx.fragment.app.testing.FragmentScenario
+import androidx.preference.PreferenceFragmentCompat
+import com.android.settings.R
+import com.android.settings.flags.Flags
+import com.android.settings.testutils.shadow.ShadowUtils
+import com.android.settingslib.preference.CatalystScreenTestCase
+import com.google.common.truth.Truth.assertThat
+import org.junit.After
+import org.junit.Test
+import org.mockito.ArgumentMatchers.anyInt
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.stub
+import org.robolectric.annotation.Config
+
+@Config(shadows = [ShadowUtils::class])
+class PowerUsageSummaryScreenTest : CatalystScreenTestCase() {
+
+    override val preferenceScreenCreator = PowerUsageSummaryScreen()
+
+    override val flagName: String
+        get() = Flags.FLAG_CATALYST_POWER_USAGE_SUMMARY_SCREEN
+
+    private val mockResources = mock<Resources>()
+
+    private val context =
+        object : ContextWrapper(appContext) {
+            override fun getResources(): Resources = mockResources
+        }
+
+    @After
+    fun tearDown() {
+        ShadowUtils.reset()
+    }
+
+    @Test
+    fun key() {
+        assertThat(preferenceScreenCreator.key).isEqualTo(PowerUsageSummaryScreen.KEY)
+    }
+
+    @Test
+    fun isAvailable_configTrue_shouldReturnTrue() {
+        mockResources.stub { on { getBoolean(anyInt()) } doReturn true }
+
+        assertThat(preferenceScreenCreator.isAvailable(context)).isTrue()
+    }
+
+    @Test
+    fun isAvailable_configFalse_shouldReturnFalse() {
+        mockResources.stub { on { getBoolean(anyInt()) } doReturn false }
+
+        assertThat(preferenceScreenCreator.isAvailable(context)).isFalse()
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_HOMEPAGE_REVAMP)
+    fun getIcon_whenHomePageRevampFlagOn() {
+        assertThat(preferenceScreenCreator.getIcon(context))
+            .isEqualTo(R.drawable.ic_settings_battery_filled)
+    }
+
+    @Test
+    @DisableFlags(Flags.FLAG_HOMEPAGE_REVAMP)
+    fun getIcon_whenHomePageRevampFlagOff() {
+        assertThat(preferenceScreenCreator.getIcon(context))
+            .isEqualTo(R.drawable.ic_settings_battery_white)
+    }
+
+    override fun migration() {
+        ShadowUtils.setIsBatteryPresent(false)
+
+        super.migration()
+    }
+
+    override fun launchFragmentScenario(fragmentClass: Class<PreferenceFragmentCompat>) =
+        FragmentScenario.launch(
+            fragmentClass,
+            themeResId = R.style.Theme_CollapsingToolbar_Settings,
+        )
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryTest.java
index 19d5e59..0473228 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryTest.java
@@ -37,13 +37,13 @@
 import android.os.Bundle;
 import android.provider.Settings;
 
+import androidx.fragment.app.FragmentActivity;
 import androidx.loader.app.LoaderManager;
 import androidx.loader.content.Loader;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.SettingsActivity;
 import com.android.settings.fuelgauge.BatteryBroadcastReceiver;
 import com.android.settings.fuelgauge.BatteryInfo;
 import com.android.settings.fuelgauge.BatteryUtils;
@@ -82,7 +82,7 @@
         sAdditionalBatteryInfoIntent = new Intent("com.example.app.ADDITIONAL_BATTERY_INFO");
     }
 
-    @Mock private SettingsActivity mSettingsActivity;
+    @Mock private FragmentActivity mActivity;
     @Mock private LoaderManager mLoaderManager;
     @Mock private Loader<BatteryTip> mBatteryTipLoader;
     @Mock private Loader<BatteryInfo> mBatteryInfoLoader;
@@ -106,7 +106,7 @@
         mFragment = spy(new TestFragment(mRealContext, mLoaderManager));
         mFragment.initFeatureProvider();
         doNothing().when(mFragment).restartBatteryStatsLoader(anyInt());
-        when(mFragment.getActivity()).thenReturn(mSettingsActivity);
+        when(mFragment.getActivity()).thenReturn(mActivity);
         when(mFeatureFactory.powerUsageFeatureProvider.getAdditionalBatteryInfoIntent())
                 .thenReturn(sAdditionalBatteryInfoIntent);
         mFragment.mBatteryUtils = Mockito.spy(new BatteryUtils(mRealContext));
diff --git a/tests/robotests/src/com/android/settings/gestures/ButtonNavigationSettingsAssistControllerTest.java b/tests/robotests/src/com/android/settings/gestures/ButtonNavigationSettingsAssistControllerTest.java
index d961cdf..493fb01 100644
--- a/tests/robotests/src/com/android/settings/gestures/ButtonNavigationSettingsAssistControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/ButtonNavigationSettingsAssistControllerTest.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.gestures;
 
+import static android.app.contextualsearch.ContextualSearchManager.FEATURE_CONTEXTUAL_SEARCH;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Mockito.mock;
@@ -23,6 +25,7 @@
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.provider.Settings;
 
@@ -40,13 +43,16 @@
             "assistant_long_press_home_gesture";
 
     private Context mContext;
+    private PackageManager mPackageManager;
     private Resources mResources;
     private ButtonNavigationSettingsAssistController mController;
 
     @Before
     public void setUp() {
         mContext = spy(ApplicationProvider.getApplicationContext());
+        mPackageManager = mock(PackageManager.class);
         mResources = mock(Resources.class);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
         when(mContext.getResources()).thenReturn(mResources);
 
         mController = new ButtonNavigationSettingsAssistController(
@@ -97,4 +103,23 @@
                 Settings.Secure.ASSIST_LONG_PRESS_HOME_ENABLED, -1)).isEqualTo(1);
     }
 
+    @Test
+    public void onPreferenceChange_preferenceChecked_valueTrue() {
+        mController.onPreferenceChange(null, true);
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ASSIST_LONG_PRESS_HOME_ENABLED, -1)).isEqualTo(1);
+    }
+
+    @Test
+    public void onPreferenceChange_preferenceUnchecked_valueFalse() {
+        mController.onPreferenceChange(null, false);
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ASSIST_LONG_PRESS_HOME_ENABLED, -1)).isEqualTo(0);
+    }
+
+    @Test
+    public void isAvailable_hasContextualSearchSystemFeature_shouldReturnFalse() {
+        when(mPackageManager.hasSystemFeature(FEATURE_CONTEXTUAL_SEARCH)).thenReturn(true);
+        assertThat(mController.isAvailable()).isFalse();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/gestures/NavigationSettingsContextualSearchControllerTest.java b/tests/robotests/src/com/android/settings/gestures/NavigationSettingsContextualSearchControllerTest.java
new file mode 100644
index 0000000..a4744db
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/NavigationSettingsContextualSearchControllerTest.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2024 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.gestures;
+
+import static android.app.contextualsearch.ContextualSearchManager.FEATURE_CONTEXTUAL_SEARCH;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.provider.Settings;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.testutils.shadow.ShadowDeviceConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = ShadowDeviceConfig.class)
+public class NavigationSettingsContextualSearchControllerTest {
+
+    private static final String KEY_PRESS_HOLD_FOR_SEARCH = "search_gesture_press_hold";
+
+    private NavigationSettingsContextualSearchController mController;
+    private Context mContext;
+    private PackageManager mPackageManager;
+
+    @Before
+    public void setUp() {
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        mPackageManager = mock(PackageManager.class);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+        mController = new NavigationSettingsContextualSearchController(
+                mContext, KEY_PRESS_HOLD_FOR_SEARCH);
+    }
+
+    @Test
+    public void isAvailable_hasContextualSearchSystemFeature_shouldReturnTrue() {
+        when(mPackageManager.hasSystemFeature(FEATURE_CONTEXTUAL_SEARCH)).thenReturn(true);
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_doesNotHaveContextualSearchSystemFeature_shouldReturnFalse() {
+        when(mPackageManager.hasSystemFeature(FEATURE_CONTEXTUAL_SEARCH)).thenReturn(false);
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isChecked_noDefault_true() {
+        assertThat(mController.isChecked()).isTrue();
+    }
+
+    @Test
+    public void isChecked_valueFalse_shouldReturnFalse() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.SEARCH_ALL_ENTRYPOINTS_ENABLED, 0);
+        assertThat(mController.isChecked()).isFalse();
+    }
+
+    @Test
+    public void isChecked_valueTrue_shouldReturnTrue() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.SEARCH_ALL_ENTRYPOINTS_ENABLED, 1);
+        assertThat(mController.isChecked()).isTrue();
+    }
+
+    @Test
+    public void onPreferenceChange_preferenceChecked_valueTrue() {
+        mController.onPreferenceChange(null, true);
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.SEARCH_ALL_ENTRYPOINTS_ENABLED, -1)).isEqualTo(1);
+    }
+
+    @Test
+    public void onPreferenceChange_preferenceUnchecked_valueFalse() {
+        mController.onPreferenceChange(null, false);
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.SEARCH_ALL_ENTRYPOINTS_ENABLED, -1)).isEqualTo(0);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityBounceKeysControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityBounceKeysControllerTest.java
index d16f697..b385b2f 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityBounceKeysControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityBounceKeysControllerTest.java
@@ -57,7 +57,7 @@
     public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
     @Rule
     public MockitoRule mMockitoRule = MockitoJUnit.rule();
-    private static final String PREFERENCE_KEY = "accessibility_bounce_keys";
+    private static final String PREFERENCE_KEY = "keyboard_a11y_page_bounce_keys";
     @Mock
     private Preference mPreference;
     private Context mContext;
@@ -116,8 +116,8 @@
     public void handlePreferenceTreeClick_performClickOn200_updatesBounceKeysThreshold() {
         mKeyboardAccessibilityBounceKeysController.handlePreferenceTreeClick(mPreference);
         AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
-        RadioGroup radioGroup = alertDialog.findViewById(R.id.bounce_key_value_group);
-        radioGroup.check(R.id.bounce_key_value_200);
+        RadioGroup radioGroup = alertDialog.findViewById(R.id.input_setting_keys_value_group);
+        radioGroup.check(R.id.input_setting_keys_value_200);
 
         alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).performClick();
         ShadowLooper.idleMainLooper();
diff --git a/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityMouseKeysControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityMouseKeysControllerTest.java
index 5922497..fdb4ab9 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityMouseKeysControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityMouseKeysControllerTest.java
@@ -50,7 +50,7 @@
         mContext = RuntimeEnvironment.application;
         mKeyboardAccessibilityMouseKeysController = new KeyboardAccessibilityMouseKeysController(
                 mContext,
-                "accessibility_mouse_keys");
+                "keyboard_a11y_page_mouse_keys");
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilitySlowKeysControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilitySlowKeysControllerTest.java
index 5f6908a..9f82b75 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilitySlowKeysControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilitySlowKeysControllerTest.java
@@ -18,39 +18,59 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.hardware.input.InputSettings;
 import android.platform.test.annotations.DisableFlags;
 import android.platform.test.annotations.EnableFlags;
 import android.platform.test.flag.junit.SetFlagsRule;
+import android.widget.RadioGroup;
 
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.Preference;
+
+import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.keyboard.Flags;
+import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
 
 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;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowLooper;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {
         com.android.settings.testutils.shadow.ShadowFragment.class,
+        ShadowAlertDialogCompat.class,
 })
 public class KeyboardAccessibilitySlowKeysControllerTest {
     @Rule
     public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+    @Rule
+    public MockitoRule mMockitoRule = MockitoJUnit.rule();
+    private static final String PREFERENCE_KEY = "keyboard_a11y_page_slow_keys";
+    @Mock
+    private Preference mPreference;
     private Context mContext;
     private KeyboardAccessibilitySlowKeysController mKeyboardAccessibilitySlowKeysController;
 
     @Before
     public void setUp() {
         mContext = RuntimeEnvironment.application;
+        mContext.setTheme(androidx.appcompat.R.style.Theme_AppCompat);
         mKeyboardAccessibilitySlowKeysController = new KeyboardAccessibilitySlowKeysController(
                 mContext,
-                "accessibility_slow_keys");
+                PREFERENCE_KEY);
+        when(mPreference.getKey()).thenReturn(PREFERENCE_KEY);
     }
 
     @Test
@@ -82,4 +102,28 @@
 
         assertThat(isEnabled).isFalse();
     }
+
+    @Test
+    public void handlePreferenceTreeClick_dialogShows() {
+        mKeyboardAccessibilitySlowKeysController.handlePreferenceTreeClick(mPreference);
+
+        AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
+
+        assertThat(alertDialog.isShowing()).isTrue();
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_performClickOn200_updatesSlowKeysThreshold() {
+        mKeyboardAccessibilitySlowKeysController.handlePreferenceTreeClick(mPreference);
+        AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
+        RadioGroup radioGroup = alertDialog.findViewById(R.id.input_setting_keys_value_group);
+        radioGroup.check(R.id.input_setting_keys_value_200);
+
+        alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).performClick();
+        ShadowLooper.idleMainLooper();
+
+        assertThat(alertDialog.isShowing()).isFalse();
+        int threshold = InputSettings.getAccessibilitySlowKeysThreshold(mContext);
+        assertThat(threshold).isEqualTo(200);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityStickyKeysControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityStickyKeysControllerTest.java
index 06cb558..4631f57 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityStickyKeysControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityStickyKeysControllerTest.java
@@ -50,7 +50,7 @@
         mContext = RuntimeEnvironment.application;
         mKeyboardAccessibilityStickyKeysController = new KeyboardAccessibilityStickyKeysController(
                 mContext,
-                "accessibility_sticky_keys");
+                "keyboard_a11y_page_sticky_keys");
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/location/LocationScreenTest.kt b/tests/robotests/src/com/android/settings/location/LocationScreenTest.kt
new file mode 100644
index 0000000..1d1696d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/location/LocationScreenTest.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2024 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.location
+
+import android.content.Context
+import android.content.ContextWrapper
+import android.location.LocationManager
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.R
+import com.android.settings.flags.Flags
+import com.android.settingslib.preference.CatalystScreenTestCase
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.stub
+
+@RunWith(AndroidJUnit4::class)
+class LocationScreenTest : CatalystScreenTestCase() {
+    override val preferenceScreenCreator = LocationScreen()
+
+    override val flagName: String
+        get() = Flags.FLAG_CATALYST_LOCATION_SETTINGS
+
+    private val mockLocationManager = mock<LocationManager>()
+
+    private val context =
+            object : ContextWrapper(appContext) {
+                override fun getSystemService(name: String): Any =
+                    when (name) {
+                        Context.LOCATION_SERVICE -> mockLocationManager
+                        else -> super.getSystemService(name)
+                    }
+            }
+
+    @Test
+    fun key() {
+        assertThat(preferenceScreenCreator.key).isEqualTo(LocationScreen.KEY)
+    }
+
+    @Test
+    fun getSummary_enableLocation_shouldReturnLoading() {
+        mockLocationManager.stub { on { isLocationEnabled } doReturn true }
+
+        assertThat(preferenceScreenCreator.getSummary(context)).isEqualTo(
+                context.getString(R.string.location_settings_loading_app_permission_stats))
+    }
+
+    @Test
+    fun getSummary_disableLocation_shouldReturnLocationOff() {
+        mockLocationManager.stub { on { isLocationEnabled } doReturn false }
+
+        assertThat(preferenceScreenCreator.getSummary(context)).isEqualTo(
+                context.getString(R.string.location_settings_summary_location_off))
+    }
+
+    override fun migration() {
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkListScreenTest.kt b/tests/robotests/src/com/android/settings/network/MobileNetworkListScreenTest.kt
new file mode 100644
index 0000000..1d7a1d9
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/MobileNetworkListScreenTest.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2024 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 androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.flags.Flags
+import com.android.settingslib.preference.CatalystScreenTestCase
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class MobileNetworkListScreenTest : CatalystScreenTestCase() {
+    override val preferenceScreenCreator = MobileNetworkListScreen()
+
+    override val flagName: String
+        get() = Flags.FLAG_CATALYST_MOBILE_NETWORK_LIST
+
+    @Test
+    fun key() {
+        assertThat(preferenceScreenCreator.key).isEqualTo(MobileNetworkListScreen.KEY)
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/network/NetworkDashboardScreenTest.kt b/tests/robotests/src/com/android/settings/network/NetworkDashboardScreenTest.kt
new file mode 100644
index 0000000..8318e09
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/NetworkDashboardScreenTest.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2024 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 androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.flags.Flags
+import com.android.settings.testutils.shadow.ShadowConnectivityManager
+import com.android.settingslib.preference.CatalystScreenTestCase
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.annotation.Config
+
+@RunWith(AndroidJUnit4::class)
+@Config(shadows = [ShadowConnectivityManager::class])
+class NetworkDashboardScreenTest : CatalystScreenTestCase() {
+    override val preferenceScreenCreator = NetworkDashboardScreen()
+
+    override val flagName: String
+        get() = Flags.FLAG_CATALYST_NETWORK_PROVIDER_AND_INTERNET_SCREEN
+
+    @Test
+    fun key() {
+        assertThat(preferenceScreenCreator.key).isEqualTo(NetworkDashboardScreen.KEY)
+    }
+
+    override fun migration() {
+        // Avoid thread hanging when TetheringManager.isTetheringSupported
+        ShadowConnectivityManager.getShadow().setTetheringSupported(true)
+
+        super.migration()
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java b/tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java
index 400f73f..df399d7 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java
@@ -70,6 +70,7 @@
 
 import com.android.settings.AirplaneModeEnabler;
 import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFeatureProvider;
 import com.android.settings.datausage.DataUsagePreference;
 import com.android.settings.testutils.shadow.ShadowDataUsageUtils;
 import com.android.settings.testutils.shadow.ShadowFragment;
@@ -98,6 +99,7 @@
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 import org.robolectric.shadows.ShadowToast;
+import org.robolectric.util.ReflectionHelpers;
 
 import java.util.List;
 
@@ -190,6 +192,9 @@
                 .when(mFirstWifiEntryPreferenceCategory).getKey();
         mNetworkProviderSettings.mFirstWifiEntryPreferenceCategory =
                 mFirstWifiEntryPreferenceCategory;
+
+        ReflectionHelpers.setField(mNetworkProviderSettings, "mDashboardFeatureProvider",
+                mock(DashboardFeatureProvider.class));
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/network/apn/ApnEditorTest.java b/tests/robotests/src/com/android/settings/network/apn/ApnEditorTest.java
deleted file mode 100644
index d8895d5..0000000
--- a/tests/robotests/src/com/android/settings/network/apn/ApnEditorTest.java
+++ /dev/null
@@ -1,625 +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.apn;
-
-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.doNothing;
-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.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.PersistableBundle;
-import android.os.UserManager;
-import android.telephony.CarrierConfigManager;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.EditTextPreference;
-import androidx.preference.ListPreference;
-import androidx.preference.MultiSelectListPreference;
-import androidx.preference.SwitchPreference;
-
-import com.android.settings.R;
-import com.android.settings.network.ProxySubscriptionManager;
-import com.android.settings.network.apn.ApnEditor.ApnData;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = {
-        com.android.settings.testutils.shadow.ShadowFragment.class,
-})
-public class ApnEditorTest {
-
-    private static final Object[] APN_DATA = {
-            0, /* ID */
-            "apn_name" /* apn name */,
-            "apn.com" /* apn */,
-            "" /* proxy */,
-            "" /* port */,
-            "" /* username */,
-            "" /* server */,
-            "" /* password */,
-            "" /* MMSC */,
-            "123" /* MCC */,
-            "456" /* MNC */,
-            "123456" /* operator numeric */,
-            "" /* MMS proxy */,
-            "" /* MMS port */,
-            0 /* Authentication type */,
-            "default,supl,ia" /* APN type */,
-            "IP" /* APN protocol */,
-            1 /* APN enable/disable */,
-            0 /* Bearer */,
-            0 /* Bearer BITMASK*/,
-            "IPV6" /* APN roaming protocol */,
-            "None" /* MVNO type */,
-            "", /* MVNO value */
-    };
-
-    private static final int CURSOR_INTEGER_INDEX = 0;
-    private static final int CURSOR_STRING_INDEX = 1;
-
-    private static final Uri APN_URI = Uri.parse("Apn://row/1");
-
-    @Mock
-    private Cursor mCursor;
-
-    @Mock
-    private FragmentActivity mActivity;
-    @Mock
-    private UserManager mUserManager;
-    @Mock
-    private ProxySubscriptionManager mProxySubscriptionMgr;
-    @Mock
-    private CarrierConfigManager mCarrierConfigManager;
-    @Captor
-    private ArgumentCaptor<Uri> mUriCaptor;
-
-    private ApnEditor mApnEditorUT;
-    private Context mContext;
-    private Resources mResources;
-    private PersistableBundle mBundle = new PersistableBundle();
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-
-        mResources = mContext.getResources();
-        mApnEditorUT = spy(new ApnEditor());
-
-        doReturn(mActivity).when(mApnEditorUT).getActivity();
-        doReturn(mResources).when(mApnEditorUT).getResources();
-        doNothing().when(mApnEditorUT).finish();
-        doNothing().when(mApnEditorUT).showError();
-        doReturn(mContext).when(mApnEditorUT).getContext();
-        doReturn(mContext.getTheme()).when(mActivity).getTheme();
-        doReturn(mContext.getContentResolver()).when(mActivity).getContentResolver();
-
-        doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
-        doReturn(true).when(mUserManager).isAdminUser();
-        doReturn(false).when(mUserManager)
-                .hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS);
-        doReturn(mCarrierConfigManager).when(mContext)
-                .getSystemService(Context.CARRIER_CONFIG_SERVICE);
-        doReturn(mBundle).when(mCarrierConfigManager).getConfigForSubId(anyInt());
-
-        setMockPreference(mContext);
-        mApnEditorUT.mApnData = new FakeApnData(APN_DATA);
-        mApnEditorUT.sNotSet = "Not Set";
-    }
-
-    @Test
-    public void testApnEditor_doesNotUseManagedQuery() {
-        mApnEditorUT.getApnDataFromUri(Mockito.mock(Uri.class));
-
-        verify(mActivity, never()).managedQuery(
-                any(Uri.class),
-                any(String[].class),
-                any(String.class),
-                any(String.class));
-
-        verify(mActivity, never()).managedQuery(
-                any(Uri.class),
-                any(String[].class),
-                any(String.class),
-                any(String[].class),
-                any(String.class));
-    }
-
-    @Test
-    public void getApnDataFromUri_emptyCursor_returnsNull() {
-        var mockContentResolver = mock(ContentResolver.class);
-        var mockCursor = mock(Cursor.class);
-        doReturn(mockContentResolver).when(mActivity).getContentResolver();
-        when(mockContentResolver.query(any(), any(), any(), any(), any())).thenReturn(mockCursor);
-        when(mockCursor.moveToFirst()).thenReturn(false);
-
-        var apnData = mApnEditorUT.getApnDataFromUri(mock(Uri.class));
-
-        assertThat(apnData).isNull();
-    }
-
-    @Test
-    public void testSetStringValue_valueChanged_shouldSetValue() {
-        // GIVEN an APN value which is different than the APN value in database
-        final String apnKey = "apn";
-        final String apnValue = "testing.com";
-        final ContentValues cv = new ContentValues();
-
-        // WHEN try to check and set the apn value
-        final boolean isDiff = mApnEditorUT.setStringValueAndCheckIfDiff(
-                cv, apnKey, apnValue, false /* assumeDiff */, ApnEditor.APN_INDEX);
-
-        // THEN the APN value is different than the one in database, and it has been stored in the
-        // given ContentValues
-        assertThat(isDiff).isTrue();
-        assertThat(apnValue).isEqualTo(cv.getAsString(apnKey));
-    }
-
-    @Test
-    public void testSetStringValue_valueNotChanged_shouldNotSetValue() {
-        // GIVEN an APN value which is same as the APN value in database
-        final String apnKey = "apn";
-        final String apnValue = (String) APN_DATA[ApnEditor.APN_INDEX];
-        final ContentValues cv = new ContentValues();
-
-        // WHEN try to check and set the apn value
-        final boolean isDiff = mApnEditorUT.setStringValueAndCheckIfDiff(
-                cv, apnKey, apnValue, false /* assumeDiff */, ApnEditor.APN_INDEX);
-
-        // THEN the APN value is same as the one in database, and the new APN value is not stored
-        // in the given ContentValues
-        assertThat(isDiff).isFalse();
-        assertThat(cv.get(apnKey)).isNull();
-    }
-
-    @Test
-    public void testSetStringValue_nullValue_shouldNotSetValue_shouldNotSetValue() {
-        // GIVEN a null APN value
-        final String apnKey = "apn";
-        final String apnValue = null;
-        final ContentValues cv = new ContentValues();
-
-        // WHEN try to check and set the apn value
-        final boolean isDiff = mApnEditorUT.setStringValueAndCheckIfDiff(
-                cv, apnKey, apnValue, false /* assumeDiff */, ApnEditor.APN_INDEX);
-
-        // THEN the APN value is different than the one in database, but the null value is not
-        // stored in the given ContentValues
-        assertThat(isDiff).isTrue();
-        assertThat(cv.get(apnKey)).isNull();
-    }
-
-    @Test
-    public void testSetIntValue_valueChanged_shouldSetValue() {
-        // GIVEN a value indicated whether the apn is enabled, and it's different than the value in
-        // the database
-        final String apnEnabledKey = "apn_enabled";
-        final int apnEnabledValue = 0;
-        final ContentValues cv = new ContentValues();
-
-        // WHEN try to check and set the apn enabled
-        final boolean isDiff = mApnEditorUT.setIntValueAndCheckIfDiff(
-                cv,
-                apnEnabledKey,
-                apnEnabledValue,
-                false /* assumeDiff */,
-                ApnEditor.CARRIER_ENABLED_INDEX);
-
-        // THEN the apn enabled field is different than the one in database, and it has been stored
-        // in the given ContentValues
-        assertThat(isDiff).isTrue();
-        assertThat(cv.getAsInteger(apnEnabledKey)).isEqualTo(apnEnabledValue);
-    }
-
-    @Test
-    public void testSetIntValue_valueNotChanged_shouldNotSetValue() {
-        // GIVEN a value indicated whether the apn is enabled, and it's same as the one in the
-        // database
-        final String apnEnabledKey = "apn_enabled";
-        final int apnEnabledValue = (int) APN_DATA[ApnEditor.CARRIER_ENABLED_INDEX];
-        final ContentValues cv = new ContentValues();
-
-        // WHEN try to check and set the apn enabled
-        final boolean isDiff = mApnEditorUT.setIntValueAndCheckIfDiff(
-                cv,
-                apnEnabledKey,
-                apnEnabledValue,
-                false /* assumeDiff */,
-                ApnEditor.CARRIER_ENABLED_INDEX);
-
-        // THEN the apn enabled field is same as the one in the database, and the filed is not
-        // stored in the given ContentValues
-        assertThat(isDiff).isFalse();
-        assertThat(cv.get(apnEnabledKey)).isNull();
-    }
-
-    @Test
-    public void testValidateApnData_validData_shouldReturnNull() {
-        // GIVEN a valid apn data
-        mApnEditorUT.fillUI(true /* firstTime */);
-
-        // WHEN validate the apn data
-        final String errMsg = mApnEditorUT.validateApnData();
-
-        // THEN the error message should be null
-        assertThat(errMsg).isNull();
-    }
-
-    @Test
-    public void testValidateApn_apnNameNotSet_shouldReturnErrorMessage() {
-        // GIVEN a apn data without the apn name
-        mApnEditorUT.mApnData.mData[ApnEditor.NAME_INDEX] = "";
-        mApnEditorUT.fillUI(true /* firstTime */);
-
-        // THEN validate the apn data
-        final String errMsg = mApnEditorUT.validateApnData();
-
-        // THEN the error message indicated the apn name not set is returned
-        assertThat(errMsg).isEqualTo(mResources.getString(R.string.error_name_empty));
-    }
-
-    @Test
-    public void testValidateApnData_apnNotSet_shouldReturnErrorMessage() {
-        // GIVEN a apn data without the apn
-        mApnEditorUT.mApnData.mData[ApnEditor.APN_INDEX] = "";
-        mApnEditorUT.fillUI(true /* firstTime */);
-
-        // THEN validate the apn data
-        final String errMsg = mApnEditorUT.validateApnData();
-
-        // THEN the error message indicated the apn not set is returned
-        assertThat(errMsg).isEqualTo(mResources.getString(R.string.error_apn_empty));
-    }
-
-    @Test
-    public void testValidateApnData_mccInvalid_shouldReturnErrorMessage() {
-        // The length of the mcc should be 3
-        mApnEditorUT.mApnData.mData[ApnEditor.MCC_INDEX] = "1324";
-        mApnEditorUT.fillUI(true /* firstTime */);
-
-        // WHEN validate the apn data
-        final String errMsg = mApnEditorUT.validateApnData();
-
-        // THEN the error message indicated the mcc invalid is returned
-        assertThat(errMsg).isEqualTo(mResources.getString(R.string.error_mcc_not3));
-    }
-
-    @Test
-    public void testValidateApnData_mncInvalid_shouldReturnErrorMessage() {
-        // GIVEN an apn data with invalid mnc
-        // The length of the mnc should be 2 or 3
-        mApnEditorUT.mApnData.mData[ApnEditor.MNC_INDEX] = "1324";
-        mApnEditorUT.fillUI(true /* firstTime */);
-
-        // WHEN validate the apn data
-        final String errMsg = mApnEditorUT.validateApnData();
-
-        // THEN the error message indicated the mnc invalid is returned
-        assertThat(errMsg).isEqualTo(mResources.getString(R.string.error_mnc_not23));
-    }
-
-    @Test
-    public void testSaveApnData_pressBackButtonWithValidApnData_shouldSaveApnData() {
-        // GIVEN a valid apn data
-        mApnEditorUT.fillUI(true /* firstTime */);
-
-        // WHEN press the back button
-        final KeyEvent event = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK);
-        mApnEditorUT.onKey(new View(mContext), KeyEvent.KEYCODE_BACK, event);
-
-        // THEN the apn data is saved and the apn editor is closed
-        verify(mApnEditorUT).validateAndSaveApnData();
-        verify(mApnEditorUT).finish();
-    }
-
-    @Test
-    public void testSaveApnData_pressSaveButtonWithValidApnData_shouldSaveApnData() {
-        // GIVEN a valid apn data
-        mApnEditorUT.fillUI(true /* firstTime */);
-
-        // WHEN press the save button
-        MenuItem item = Mockito.mock(MenuItem.class);
-        // Menu.FIRST + 1 indicated the SAVE option in ApnEditor
-        doReturn(Menu.FIRST + 1).when(item).getItemId();
-        mApnEditorUT.onOptionsItemSelected(item);
-
-        // THEN the apn data is saved and the apn editor is closed
-        verify(mApnEditorUT).validateAndSaveApnData();
-        verify(mApnEditorUT).finish();
-    }
-
-    @Test
-    public void testSaveApnData_apnDataInvalid_shouldNotSaveApnData() {
-        // GIVEN an invalid apn data
-        // The valid apn data should contains a non-empty apn name
-        mApnEditorUT.mApnData.mData[ApnEditor.NAME_INDEX] = "";
-        mApnEditorUT.fillUI(true /* firstTime */);
-
-        // WHEN press the save button
-        final MenuItem item = Mockito.mock(MenuItem.class);
-        // Menu.FIRST + 1 indicated the SAVE option in ApnEditor
-        doReturn(Menu.FIRST + 1).when(item).getItemId();
-        mApnEditorUT.onOptionsItemSelected(item);
-
-        // THEN the error dialog is shown
-        verify(mApnEditorUT).validateAndSaveApnData();
-        verify(mApnEditorUT).showError();
-    }
-
-    @Test
-    public void testDeleteApnData_shouldDeleteData() {
-        // GIVEN a valid apn data correspond a row in database
-        final Uri apnUri = Uri.parse("content://telephony/carriers/1");
-        mApnEditorUT.mApnData = new FakeApnData(APN_DATA, apnUri);
-        mApnEditorUT.fillUI(true /* firstTime */);
-        ContentResolver mockContentResolver = Mockito.mock(ContentResolver.class);
-        doReturn(mockContentResolver).when(mActivity).getContentResolver();
-
-        // WHEN press the save button
-        final MenuItem item = Mockito.mock(MenuItem.class);
-        // Menu.FIRST indicated the DELETE option in ApnEditor
-        doReturn(Menu.FIRST).when(item).getItemId();
-        mApnEditorUT.onOptionsItemSelected(item);
-
-        // THEN the apn data is deleted and the apn editor is closed
-        verify(mockContentResolver).delete(mUriCaptor.capture(), any(), any());
-        assertThat(apnUri).isEqualTo(mUriCaptor.getValue());
-        verify(mApnEditorUT).finish();
-    }
-
-    @Test
-    public void testDeleteApnData_shouldNotPresentMenuWhenNotSupportAdding() {
-        mBundle.putBoolean(CarrierConfigManager.KEY_ALLOW_ADDING_APNS_BOOL, false);
-
-        MenuItem item = Mockito.mock(MenuItem.class);
-        Menu menu = Mockito.mock(Menu.class);
-        doReturn(item).when(menu).add(anyInt(), anyInt(), anyInt(), anyInt());
-
-        mApnEditorUT.getCarrierCustomizedConfig(mContext);
-        mApnEditorUT.onCreateOptionsMenu(menu, null);
-
-        verify(menu, times(0)).add(anyInt(), eq(ApnEditor.MENU_DELETE), anyInt(), anyInt());
-    }
-
-    @Test(expected = ClassCastException.class)
-    public void testApnData_invalidIntegerType_throwsInvalidTypeException() {
-        // GIVEN a ApnData constructed from cursor
-        initCursor();
-        final ApnData data = new ApnData(APN_URI, mCursor);
-
-        // WHEN get a string from an integer column
-        // THEN the InvalidTypeException is threw
-        data.getString(CURSOR_INTEGER_INDEX);
-    }
-
-    @Test(expected = ClassCastException.class)
-    public void testApnData_invalidStringType_throwsInvalidTypeException() {
-        // GIVEN a ApnData constructed from cursor
-        initCursor();
-        final ApnData data = new ApnData(APN_URI, mCursor);
-
-        // WHEN get a integer from a string column
-        // THEN the InvalidTypeException is threw
-        data.getInteger(CURSOR_STRING_INDEX);
-    }
-
-    @Test
-    public void testApnData_validIntegerType_returnCorrectValue() {
-        // GIVEN a ApnData constructed from cursor
-        initCursor();
-        final ApnData data = new ApnData(APN_URI, mCursor);
-
-        // WHEN get integer from an integer column
-        final int val = data.getInteger(CURSOR_INTEGER_INDEX);
-
-        // THEN the integer is returned correctly
-        assertThat(val).isEqualTo(mCursor.getInt(CURSOR_INTEGER_INDEX));
-    }
-
-    @Test
-    public void testApnData_validStringType_returnCorrectValue() {
-        // GIVEN a ApnData constructed from cursor
-        initCursor();
-        final ApnData data = new ApnData(APN_URI, mCursor);
-
-        // WHEN get string from a string column
-        final String str = data.getString(CURSOR_STRING_INDEX);
-
-        // THEN the integer is returned correctly
-        assertThat(str).isEqualTo(mCursor.getString(CURSOR_STRING_INDEX));
-    }
-
-    @Test
-    public void testApnData_nullValueColumn_returnNull() {
-        // GIVEN a empty ApnData
-        final ApnData data = new ApnData(3);
-
-        // WHEN get string value from a null column
-        final String str = data.getString(0);
-
-        // THEN the null value is returned
-        assertThat(str).isNull();
-    }
-
-    @Test
-    public void formatInteger_shouldParseString() {
-        assertThat(ApnEditor.formatInteger("42")).isEqualTo("42");
-        assertThat(ApnEditor.formatInteger("01")).isEqualTo("01");
-        assertThat(ApnEditor.formatInteger("001")).isEqualTo("001");
-    }
-
-    @Test
-    public void formatInteger_shouldIgnoreNonIntegers() {
-        assertThat(ApnEditor.formatInteger("not an int")).isEqualTo("not an int");
-    }
-
-    @Test
-    public void onCreate_notAdminUser_shouldFinish() {
-        doReturn(false).when(mUserManager).isAdminUser();
-
-        mApnEditorUT.onCreate(null);
-
-        verify(mApnEditorUT).finish();
-    }
-
-    @Test
-    public void onCreate_hasUserRestriction_shouldFinish() {
-        doReturn(true).when(mUserManager)
-                .hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS);
-
-        mApnEditorUT.onCreate(null);
-
-        verify(mApnEditorUT).finish();
-    }
-
-    @Test
-    public void onCreate_noAction_shouldFinishAndNoCrash() {
-        ProxySubscriptionManager proxySubscriptionMgr = mock(ProxySubscriptionManager.class);
-        mApnEditorUT.mProxySubscriptionMgr = proxySubscriptionMgr;
-        doReturn(new Intent()).when(mActivity).getIntent();
-        doNothing().when(mApnEditorUT).addPreferencesFromResource(anyInt());
-
-        mApnEditorUT.onCreate(null);
-
-        verify(mApnEditorUT).finish();
-    }
-
-    @Test
-    public void testOnViewStateRestored_customizedValueWithoutDefault_shouldShowCustomized() {
-        mApnEditorUT.mDefaultApnProtocol = "IP";
-        mApnEditorUT.mApnData.mData[ApnEditor.PROTOCOL_INDEX] = null;
-        mApnEditorUT.mProtocol.setEntryValues(new CharSequence[]{"IP", "IPV6", "IPV4V6"});
-
-        mApnEditorUT.onViewStateRestored(null);
-
-        assertThat(mApnEditorUT.mProtocol.getSummary()).isEqualTo("IPv4");
-    }
-
-    @Test
-    public void testOnViewStateRestored_customizedValueWithDefault_shouldShowDefault() {
-        mApnEditorUT.mDefaultApnProtocol = "IP";
-        mApnEditorUT.mApnData.mData[ApnEditor.PROTOCOL_INDEX] = "IPV6";
-        mApnEditorUT.mProtocol.setEntryValues(new CharSequence[]{"IP", "IPV6", "IPV4V6"});
-
-        mApnEditorUT.onViewStateRestored(null);
-
-        assertThat(mApnEditorUT.mProtocol.getSummary()).isEqualTo("IPv6");
-    }
-
-    @Test
-    public void getUserEnteredApnType_emptyApnType_shouldReturnDefault() {
-        // case 1
-        // GIVEN read only APN types with DUN
-        mApnEditorUT.mReadOnlyApnTypes = new String [] {"dun"};
-        // GIVEN read specificApnTypeForEmptyInput with DEFAULT,DUN
-        mApnEditorUT.mDefaultApnTypes = new String [] {"default", "dun"};
-
-        // Input empty in TYPE
-        mApnEditorUT.mApnData.mData[ApnEditor.TYPE_INDEX] = "";
-        mApnEditorUT.onViewStateRestored(null);
-
-        // THEN APN type should be default
-        assertThat(mApnEditorUT.getUserEnteredApnType()).isEqualTo("default");
-
-        // case 2
-        // GIVEN read only APN types with DUN
-        mApnEditorUT.mReadOnlyApnTypes = new String [] {"dun"};
-        // GIVEN read specificApnTypeForEmptyInput with DEFAULT
-        mApnEditorUT.mDefaultApnTypes = new String [] {"default"};
-
-        // Input empty in TYPE
-        mApnEditorUT.mApnData.mData[ApnEditor.TYPE_INDEX] = "";
-        mApnEditorUT.onViewStateRestored(null);
-
-        // THEN APN type should be default
-        assertThat(mApnEditorUT.getUserEnteredApnType()).isEqualTo("default");
-    }
-
-    private void initCursor() {
-        doReturn(2).when(mCursor).getColumnCount();
-        doReturn(2).when(mCursor).getInt(CURSOR_INTEGER_INDEX);
-        doReturn("str").when(mCursor).getString(CURSOR_STRING_INDEX);
-        doReturn(Cursor.FIELD_TYPE_INTEGER).when(mCursor).getType(CURSOR_INTEGER_INDEX);
-        doReturn(Cursor.FIELD_TYPE_STRING).when(mCursor).getType(CURSOR_STRING_INDEX);
-    }
-
-    private void setMockPreference(Context context) {
-        mApnEditorUT.mName = new EditTextPreference(context);
-        mApnEditorUT.mApn = new EditTextPreference(context);
-        mApnEditorUT.mProxy = new EditTextPreference(context);
-        mApnEditorUT.mPort = new EditTextPreference(context);
-        mApnEditorUT.mUser = new EditTextPreference(context);
-        mApnEditorUT.mServer = new EditTextPreference(context);
-        mApnEditorUT.mPassword = new EditTextPreference(context);
-        mApnEditorUT.mMmsc = new EditTextPreference(context);
-        mApnEditorUT.mMcc = new EditTextPreference(context);
-        mApnEditorUT.mMnc = new EditTextPreference(context);
-        mApnEditorUT.mMmsProxy = new EditTextPreference(context);
-        mApnEditorUT.mMmsPort = new EditTextPreference(context);
-        mApnEditorUT.mAuthType = new ListPreference(context);
-        mApnEditorUT.mApnType = new EditTextPreference(context);
-        mApnEditorUT.mProtocol = new ListPreference(context);
-        mApnEditorUT.mRoamingProtocol = new ListPreference(context);
-        mApnEditorUT.mCarrierEnabled = new SwitchPreference(context);
-        mApnEditorUT.mBearerMulti = new MultiSelectListPreference(context);
-        mApnEditorUT.mMvnoType = new ListPreference(context);
-        mApnEditorUT.mMvnoMatchData = new EditTextPreference(context);
-    }
-
-    private final class FakeApnData extends ApnData {
-        FakeApnData(Object[] data) {
-            super(data.length);
-            System.arraycopy(data, 0, mData, 0, data.length);
-        }
-
-        FakeApnData(Object[] data, Uri uri) {
-            this(data);
-            mUri = uri;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java
index c6511ef..3626608 100644
--- a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java
@@ -39,6 +39,7 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
+// LINT.IfChange
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {
         com.android.settings.testutils.shadow.ShadowFragment.class,
@@ -123,3 +124,4 @@
         assertThat(System.getInt(mContentResolver, System.DTMF_TONE_WHEN_DIALING, 1)).isEqualTo(0);
     }
 }
+// LINT.ThenChange(DialPadTonePreferenceTest.kt)
diff --git a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceTest.kt b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceTest.kt
new file mode 100644
index 0000000..63e8e3d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceTest.kt
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2024 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
+
+import android.content.Context
+import android.content.ContextWrapper
+import android.provider.Settings.System.DTMF_TONE_WHEN_DIALING
+import android.telephony.TelephonyManager
+import androidx.preference.SwitchPreferenceCompat
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settingslib.datastore.SettingsSystemStore
+import com.android.settingslib.preference.DefaultPreferenceBindingFactory
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+
+// LINT.IfChange
+@RunWith(AndroidJUnit4::class)
+class DialPadTonePreferenceTest {
+    private var telephonyManager: TelephonyManager? = null
+
+    private val context =
+        object : ContextWrapper(ApplicationProvider.getApplicationContext()) {
+            override fun getSystemService(name: String): Any? =
+                when (name) {
+                    Context.TELEPHONY_SERVICE -> telephonyManager
+                    else -> super.getSystemService(name)
+                }
+        }
+
+    private val dialPadTonePreference = DialPadTonePreference()
+
+    @Test
+    fun isAvailable_voiceCapable_shouldReturnTrue() {
+        telephonyManager = mock { on { isVoiceCapable } doReturn true }
+
+        assertThat(dialPadTonePreference.isAvailable(context)).isTrue()
+    }
+
+    @Test
+    fun isAvailable_noVoicCapable_shouldReturnFalse() {
+        telephonyManager = mock { on { isVoiceCapable } doReturn false }
+
+        assertThat(dialPadTonePreference.isAvailable(context)).isFalse()
+    }
+
+    @Test
+    fun performClick_shouldPreferenceChangeToChecked() {
+        enableDialPadTone(false)
+
+        val preference = getSwitchPreference().apply { performClick() }
+
+        assertThat(preference.isChecked).isTrue()
+    }
+
+    @Test
+    fun performClick_shouldPreferenceChangeToUnchecked() {
+        enableDialPadTone(true)
+
+        val preference = getSwitchPreference().apply { performClick() }
+
+        assertThat(preference.isChecked).isFalse()
+    }
+
+    @Test
+    fun dialToneEnabled_shouldCheckedPreference() {
+        enableDialPadTone(true)
+
+        assertThat(getSwitchPreference().isChecked).isTrue()
+    }
+
+    @Test
+    fun dialToneDisabled_shouldUncheckedPreference() {
+        enableDialPadTone(false)
+
+        assertThat(getSwitchPreference().isChecked).isFalse()
+    }
+
+    private fun getSwitchPreference(): SwitchPreferenceCompat =
+        DefaultPreferenceBindingFactory.getPreferenceBinding(dialPadTonePreference).run {
+            val preference = createWidget(context)
+            bind(preference, dialPadTonePreference)
+            preference as SwitchPreferenceCompat
+        }
+
+    private fun enableDialPadTone(enabled: Boolean) =
+        SettingsSystemStore.get(context).setBoolean(DTMF_TONE_WHEN_DIALING, enabled)
+}
+// LINT.ThenChange(DialPadTonePreferenceControllerTest.java)
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManager.java
index fcd1e42..7de69a7 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManager.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManager.java
@@ -24,6 +24,8 @@
 import android.util.ArrayMap;
 import android.view.accessibility.AccessibilityManager;
 
+import com.android.internal.accessibility.common.ShortcutConstants;
+
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 
@@ -71,4 +73,14 @@
             @NonNull List<AccessibilityShortcutInfo> installedAccessibilityShortcutList) {
         mInstalledAccessibilityShortcutList = installedAccessibilityShortcutList;
     }
+
+    /**
+     * Implements the hidden method
+     * {@link AccessibilityManager#getAccessibilityShortcutTargets}.
+     */
+    @Implementation
+    public List<String> getAccessibilityShortcutTargets(
+            @ShortcutConstants.UserShortcutType int shortcutType) {
+        return List.of();
+    }
 }
diff --git a/tests/robotests/testutils/com/android/settings/testutils/SystemProperty.kt b/tests/robotests/testutils/com/android/settings/testutils/SystemProperty.kt
new file mode 100644
index 0000000..9c2574e
--- /dev/null
+++ b/tests/robotests/testutils/com/android/settings/testutils/SystemProperty.kt
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2024 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
+
+/**
+ * Helper class to override system properties.
+ *
+ * [System.setProperty] changes the static state in the JVM, which is shared by all tests. Hence,
+ * there is chance that test cases are dependent/interfered due to system property unexpectedly.
+ * This helper class backs up the old properties when invoking [override] and restore the old
+ * properties in [close] to avoid flaky testing.
+ */
+class SystemProperty(overrides: Map<String, String?> = mapOf()) : AutoCloseable {
+    private val oldProperties = mutableMapOf<String, String?>()
+
+    constructor(key: String, value: String?) : this(mapOf(key to value))
+
+    init {
+        override(overrides)
+    }
+
+    fun override(key: String, value: String?) = override(mapOf(key to value))
+
+    fun override(overrides: Map<String, String?>) {
+        // back up system properties for the overrides
+        for (key in overrides.keys) {
+            // only back up the oldest property
+            if (!oldProperties.containsKey(key)) {
+                oldProperties[key] = System.getProperty(key)
+            }
+        }
+        overrides.overrideProperties()
+    }
+
+    override fun close() {
+        // restore the backed up properties
+        oldProperties.overrideProperties()
+        oldProperties.clear()
+    }
+
+    private fun Map<String, String?>.overrideProperties() {
+        for ((key, value) in this) {
+            if (value != null) {
+                System.setProperty(key, value)
+            } else {
+                System.clearProperty(key)
+            }
+        }
+    }
+}
diff --git a/tests/screenshot/src/com/android/settings/tests/screenshot/biometrics/fingerprint/Injector.kt b/tests/screenshot/src/com/android/settings/tests/screenshot/biometrics/fingerprint/Injector.kt
index e7fc3ed..a5d0461 100644
--- a/tests/screenshot/src/com/android/settings/tests/screenshot/biometrics/fingerprint/Injector.kt
+++ b/tests/screenshot/src/com/android/settings/tests/screenshot/biometrics/fingerprint/Injector.kt
@@ -44,6 +44,7 @@
 import com.android.settings.biometrics.fingerprint2.ui.enrollment.viewmodel.FingerprintScrollViewModel
 import com.android.settings.testutils2.FakeFingerprintManagerInteractor
 import com.android.systemui.biometrics.shared.model.toFingerprintSensor
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -73,7 +74,10 @@
 
   var accessibilityInteractor =
     object : AccessibilityInteractor {
-      override val isAccessibilityEnabled: Flow<Boolean> = flowOf(true)
+      override fun isEnabledFlow(scope: CoroutineScope): Flow<Boolean> = flowOf(true)
+      override val isEnabled: Boolean
+        get() = true
+      override fun announce(clazz: Class<*>, announcement: CharSequence?) {}
     }
 
   var foldStateInteractor =
diff --git a/tests/unit/src/com/android/settings/fingerprint2/enrollment/viewmodel/FingerprintEnrollFindSensorViewModelV2Test.kt b/tests/unit/src/com/android/settings/fingerprint2/enrollment/viewmodel/FingerprintEnrollFindSensorViewModelV2Test.kt
index 04cece8..a8c5e68 100644
--- a/tests/unit/src/com/android/settings/fingerprint2/enrollment/viewmodel/FingerprintEnrollFindSensorViewModelV2Test.kt
+++ b/tests/unit/src/com/android/settings/fingerprint2/enrollment/viewmodel/FingerprintEnrollFindSensorViewModelV2Test.kt
@@ -39,6 +39,7 @@
 import com.android.settings.testutils2.FakeFingerprintManagerInteractor
 import com.android.systemui.biometrics.shared.model.toFingerprintSensor
 import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -106,7 +107,10 @@
       )
     accessibilityInteractor =
       object : AccessibilityInteractor {
-        override val isAccessibilityEnabled: Flow<Boolean> = flowOf(false)
+        override fun isEnabledFlow(scope: CoroutineScope): Flow<Boolean> = flowOf(true)
+        override val isEnabled: Boolean
+          get() = true
+        override fun announce(clazz: Class<*>, announcement: CharSequence?) {}
       }
     foldStateInteractor =
       object : FoldStateInteractor {
diff --git a/tests/unit/src/com/android/settings/fuelgauge/batteryusage/AppOptModeSharedPreferencesUtilsTest.kt b/tests/unit/src/com/android/settings/fuelgauge/batteryusage/AppOptModeSharedPreferencesUtilsTest.kt
index 95f69da..385de30 100644
--- a/tests/unit/src/com/android/settings/fuelgauge/batteryusage/AppOptModeSharedPreferencesUtilsTest.kt
+++ b/tests/unit/src/com/android/settings/fuelgauge/batteryusage/AppOptModeSharedPreferencesUtilsTest.kt
@@ -228,7 +228,7 @@
     @Test
     fun updateBatteryOptimizationMode_updateToOptimizedMode_verifyAction() {
         whenever(testBatteryOptimizeUtils?.isOptimizeModeMutable).thenReturn(true)
-        whenever(testBatteryOptimizeUtils?.getAppOptimizationMode(true))
+        whenever(testBatteryOptimizeUtils?.getAppOptimizationMode())
             .thenReturn(MODE_UNRESTRICTED)
 
         val currentOptMode =
@@ -246,9 +246,9 @@
     }
 
     @Test
-    fun updateBatteryOptimizationMode_optimizationModeNotChanged_verifyAction() {
+    fun updateBatteryOptimizationMode_optimizationModeImmutable_verifyAction() {
         whenever(testBatteryOptimizeUtils?.isOptimizeModeMutable).thenReturn(false)
-        whenever(testBatteryOptimizeUtils?.getAppOptimizationMode(true))
+        whenever(testBatteryOptimizeUtils?.appOptimizationMode)
             .thenReturn(MODE_UNRESTRICTED)
 
         val currentOptMode =
@@ -268,7 +268,7 @@
     @Test
     fun updateBatteryOptimizationMode_updateToSameOptimizationMode_verifyAction() {
         whenever(testBatteryOptimizeUtils?.isOptimizeModeMutable).thenReturn(true)
-        whenever(testBatteryOptimizeUtils?.getAppOptimizationMode(true)).thenReturn(MODE_RESTRICTED)
+        whenever(testBatteryOptimizeUtils?.appOptimizationMode).thenReturn(MODE_RESTRICTED)
 
         val currentOptMode =
             AppOptModeSharedPreferencesUtils.updateBatteryOptimizationMode(
@@ -286,7 +286,7 @@
 
     private fun insertAppOptModeEventForTest(expirationTime: Long, mode: Int = MODE_OPTIMIZED) {
         whenever(testBatteryOptimizeUtils?.isOptimizeModeMutable).thenReturn(true)
-        whenever(testBatteryOptimizeUtils?.getAppOptimizationMode(true)).thenReturn(mode)
+        whenever(testBatteryOptimizeUtils?.appOptimizationMode).thenReturn(mode)
         AppOptModeSharedPreferencesUtils.updateAppOptModeExpirationInternal(
             context,
             mutableListOf(UID),
diff --git a/tests/unit/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java
index adc8dc0..ab57f4b 100644
--- a/tests/unit/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java
@@ -18,7 +18,6 @@
 
 import static androidx.lifecycle.Lifecycle.Event.ON_START;
 
-import static com.android.settings.network.telephony.MobileNetworkUtils.getRafFromNetworkType;
 import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.CDMA;
 import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.EVDO;
 import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.GSM;
@@ -37,6 +36,7 @@
 import android.content.Context;
 import android.os.PersistableBundle;
 import android.telephony.CarrierConfigManager;
+import android.telephony.RadioAccessFamily;
 import android.telephony.ServiceState;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
@@ -304,7 +304,7 @@
     public void onPreferenceChange_updateSuccess() {
         mockEnabledNetworkMode(TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA);
         doReturn(true).when(mTelephonyManager).setPreferredNetworkTypeBitmask(
-                getRafFromNetworkType(
+                RadioAccessFamily.getRafFromNetworkType(
                         TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA));
 
         mController.updateState(mPreference);
@@ -321,7 +321,8 @@
     public void onPreferenceChange_updateFail() {
         mockEnabledNetworkMode(TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA);
         doReturn(false).when(mTelephonyManager).setPreferredNetworkTypeBitmask(
-                getRafFromNetworkType(TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA));
+                RadioAccessFamily.getRafFromNetworkType(
+                        TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA));
 
         mController.updateState(mPreference);
         mController.onViewCreated(new TestLifecycleOwner());
@@ -438,7 +439,7 @@
     }
 
     private void mockAccessFamily(int networkMode) {
-        doReturn(MobileNetworkUtils.getRafFromNetworkType(networkMode))
+        doReturn((long) RadioAccessFamily.getRafFromNetworkType(networkMode))
                 .when(mTelephonyManager)
                 .getSupportedRadioAccessFamily();
     }
diff --git a/tests/unit/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java
index f22ad3b..663945d 100644
--- a/tests/unit/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java
@@ -30,6 +30,7 @@
 
 import android.content.Context;
 import android.os.PersistableBundle;
+import android.telephony.RadioAccessFamily;
 import android.telephony.ServiceState;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
@@ -111,7 +112,7 @@
 
         verify(mTelephonyManager, times(1)).setAllowedNetworkTypesForReason(
                 TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER,
-                MobileNetworkUtils.getRafFromNetworkType(
+                RadioAccessFamily.getRafFromNetworkType(
                         TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA));
     }
 }