diff --git a/aconfig/settings_connecteddevice_flag_declarations.aconfig b/aconfig/settings_connecteddevice_flag_declarations.aconfig
index b008c20..b78acdc 100644
--- a/aconfig/settings_connecteddevice_flag_declarations.aconfig
+++ b/aconfig/settings_connecteddevice_flag_declarations.aconfig
@@ -30,16 +30,6 @@
 }
 
 flag {
-    name: "enable_bonded_bluetooth_device_searchable"
-    namespace: "pixel_cross_device_control"
-    description: "Set bonded bluetooth devices under connected devices page to be searchable by Settings search."
-    bug: "319056077"
-    metadata {
-        purpose: PURPOSE_BUGFIX
-    }
-}
-
-flag {
     name: "exclude_webcam_auth_challenge"
     namespace: "safety_center"
     description: "Gates whether to exclude webcam from USB preferences auth challenge."
diff --git a/res-product/values-ne/strings.xml b/res-product/values-ne/strings.xml
index 0576092..f3ff412 100644
--- a/res-product/values-ne/strings.xml
+++ b/res-product/values-ne/strings.xml
@@ -272,7 +272,7 @@
     <string name="ethernet_tethering_subtext" product="default" msgid="8652438909365718644">"इथरनेटमार्फत फोनको इन्टरनेट सेयर गर्नुहोस्"</string>
     <string name="ethernet_tethering_subtext" product="tablet" msgid="2227710549796706455">"इथरनेटमार्फत ट्याब्लेटको इन्टरनेट कनेक्सन अरूलाई प्रयोग गर्न दिनुहोस्"</string>
     <string name="about_settings" product="tablet" msgid="1471390492111370330">"ट्याब्लेटका बारेमा"</string>
-    <string name="about_settings" product="default" msgid="2621311564780208250">"फोनको बारेमा"</string>
+    <string name="about_settings" product="default" msgid="2621311564780208250">"फोनका बारेमा"</string>
     <string name="about_settings" product="device" msgid="7595574154492383452">"डिभाइसको बारेमा"</string>
     <string name="about_settings" product="emulator" msgid="1099246296173401003">"अनुसरण गरिएको यन्त्र बारे"</string>
     <string name="install_all_warning" product="tablet" msgid="1732116924846572063">"तपाईंको ट्याब्लेट र व्यक्तिगत डेटा अज्ञात एपबाट हुने आक्रमणमा पर्न सक्ने जोखिम अझ बढी हुन्छ। यो स्रोतबाट प्राप्त हुने एपहरू इन्स्टल गरेर, तिनीहरूको प्रयोगबाट तपाईंको ट्याब्लेटमा हुनसक्ने क्षति वा डेटाको नोक्सानीको जिम्मेवार तपाईं आफैँ हुनुहुन्छ भन्ने कुरामा तपाईं सहमत हुनुहुन्छ।"</string>
diff --git a/res/drawable/ic_face.xml b/res/drawable/ic_face.xml
new file mode 100644
index 0000000..85549fb
--- /dev/null
+++ b/res/drawable/ic_face.xml
@@ -0,0 +1,26 @@
+<!--
+  ~ Copyright (C) 2025 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="960"
+        android:viewportHeight="960"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M360,570Q339,570 324.5,555.5Q310,541 310,520Q310,499 324.5,484.5Q339,470 360,470Q381,470 395.5,484.5Q410,499 410,520Q410,541 395.5,555.5Q381,570 360,570ZM600,570Q579,570 564.5,555.5Q550,541 550,520Q550,499 564.5,484.5Q579,470 600,470Q621,470 635.5,484.5Q650,499 650,520Q650,541 635.5,555.5Q621,570 600,570ZM480,800Q614,800 707,707Q800,614 800,480Q800,456 797,433.5Q794,411 786,390Q765,395 744,397.5Q723,400 700,400Q609,400 528,361Q447,322 390,252Q358,330 298.5,387.5Q239,445 160,474Q160,476 160,477Q160,478 160,480Q160,614 253,707Q346,800 480,800ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM426,165Q468,235 540,277.5Q612,320 700,320Q714,320 727,318.5Q740,317 754,315Q712,245 640,202.5Q568,160 480,160Q466,160 453,161.5Q440,163 426,165ZM177,379Q228,350 266,304Q304,258 323,201Q272,230 234,276Q196,322 177,379ZM426,165Q426,165 426,165Q426,165 426,165Q426,165 426,165Q426,165 426,165Q426,165 426,165Q426,165 426,165Q426,165 426,165Q426,165 426,165ZM323,201Q323,201 323,201Q323,201 323,201Q323,201 323,201Q323,201 323,201Z"/>
+</vector>
diff --git a/res/layout/mouse_keys_image_item.xml b/res/layout/mouse_keys_image_item.xml
index 36b9992..52ee31a 100644
--- a/res/layout/mouse_keys_image_item.xml
+++ b/res/layout/mouse_keys_image_item.xml
@@ -15,12 +15,25 @@
   limitations under the License.
 -->
 
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-          android:id="@+id/layout_description"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:layout_marginStart="16dp"
-          android:layout_marginEnd="20dp"
-          android:layout_marginBottom="20dp"
-          android:textAppearance="?android:attr/textAppearanceListItemSmall"
-          android:drawablePadding="8dp"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="20dp"
+    android:layout_marginEnd="20dp"
+    android:layout_marginStart="16dp"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/image"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:scaleType="fitCenter" />
+
+    <TextView
+        android:id="@+id/layout_description"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="8dp"
+        android:gravity="center" />
+</LinearLayout>
\ No newline at end of file
diff --git a/res/raw-night/lottie_lock_screen_notification_minimalism_compact_view.json b/res/raw-night/lottie_lock_screen_notification_minimalism_compact_view.json
new file mode 100644
index 0000000..485db34
--- /dev/null
+++ b/res/raw-night/lottie_lock_screen_notification_minimalism_compact_view.json
@@ -0,0 +1 @@
+{"v":"5.12.1","fr":60,"ip":0,"op":180,"w":380,"h":277,"nm":"Dark_A1","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Dark_A1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[190.5,173.312,0],"ix":2,"l":2},"a":{"a":0,"k":[78.75,145.562,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,2.464],[-2.464,0],[0,-2.464],[2.464,0]],"o":[[0,-2.464],[2.464,0],[0,2.464],[-2.464,0]],"v":[[-4.462,0],[0,-4.462],[4.462,0],[0,4.462]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.117647066303,0.117647066303,0.117647066303,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[78.725,15.516],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.242,0],[-0.677,1.138],[0,2.032],[0.678,1.129],[1.251,0],[0.678,-1.138],[0,-2.024],[-0.668,-1.146]],"o":[[1.251,0],[0.678,-1.138],[0,-2.024],[-0.677,-1.138],[-1.242,0],[-0.668,1.129],[0,2.023],[0.678,1.138]],"v":[[26.841,6.365],[29.733,4.658],[30.75,-0.098],[29.733,-4.827],[26.841,-6.535],[23.961,-4.827],[22.958,-0.098],[23.961,4.658]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[2.267,0],[1.337,1.798],[0,2.918],[-1.329,1.789],[-2.25,0],[-1.338,-1.798],[0,-2.91],[1.338,-1.806]],"o":[[-2.25,0],[-1.329,-1.798],[0,-2.91],[1.337,-1.798],[2.267,0],[1.338,1.789],[0,2.909],[-1.338,1.798]],"v":[[26.828,9.674],[21.447,6.977],[19.453,-0.098],[21.447,-7.146],[26.828,-9.844],[32.235,-7.146],[34.242,-0.098],[32.235,6.977]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[1.92,0],[0.782,0.33],[0.565,0.608],[0.251,0.625],[0,0],[-0.999,0.382],[0,0],[-0.156,-0.383],[-0.296,-0.365],[-0.391,-0.2],[-0.53,0],[-0.547,0.556],[0,0.799],[0.599,0.504],[0.912,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-0.521,0.469],[0,0.782],[0.478,0.452],[0.799,0],[0.347,-0.156],[0.269,-0.286],[0.183,-0.331],[0,0],[0.912,0.495],[0,0],[-0.313,0.539],[-0.548,0.486],[-0.695,0.261],[-0.912,0],[-1.034,-0.904],[0,-1.468],[0.469,-0.73],[0.843,-0.313],[0,0],[-0.582,-0.825],[0,-1.147],[1.19,-1.077]],"o":[[-1.051,0],[-0.782,-0.338],[-0.564,-0.608],[-0.252,-0.634],[0,0],[0.999,-0.383],[0,0],[0.165,0.382],[0.304,0.356],[0.391,0.191],[0.877,0],[0.556,-0.565],[0,-0.895],[-0.6,-0.503],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0.834,0],[0.53,-0.469],[0,-0.73],[-0.469,-0.452],[-0.435,0],[-0.339,0.156],[-0.269,0.287],[-0.173,0.321],[0,0],[-0.904,-0.504],[0,0],[0.321,-0.538],[0.547,-0.487],[0.703,-0.26],[1.72,0],[1.042,0.903],[0,1.007],[-0.461,0.72],[0,0],[1.025,0.33],[0.582,0.817],[0,1.641],[-1.182,1.068]],"v":[[10.852,9.674],[8.103,9.178],[6.083,7.758],[4.859,5.909],[4.481,4.958],[5.979,4.385],[7.477,3.811],[7.712,4.385],[8.403,5.505],[9.445,6.339],[10.826,6.626],[12.963,5.792],[13.797,3.745],[12.898,1.648],[10.631,0.893],[10.044,0.893],[8.859,0.893],[8.859,-0.436],[8.859,-1.766],[10.044,-1.766],[10.448,-1.766],[12.481,-2.469],[13.276,-4.346],[12.559,-6.117],[10.657,-6.796],[9.484,-6.561],[8.572,-5.896],[7.894,-4.971],[7.634,-4.488],[6.266,-5.231],[4.911,-5.988],[5.38,-6.796],[6.683,-8.333],[8.546,-9.453],[10.969,-9.844],[15.1,-8.488],[16.663,-4.932],[15.96,-2.326],[14.005,-0.775],[14.005,-0.684],[16.416,1.049],[17.289,3.993],[15.504,8.072]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[0.634,0],[0.435,0.425],[0,0.625],[-0.425,0.426],[-0.625,0],[-0.426,-0.425],[0,-0.617],[0.434,-0.426]],"o":[[-0.625,0],[-0.425,-0.426],[0,-0.617],[0.435,-0.425],[0.634,0],[0.434,0.426],[0,0.625],[-0.426,0.425]],"v":[[0.282,6.782],[-1.308,6.144],[-1.946,4.566],[-1.308,3.003],[0.282,2.365],[1.872,3.003],[2.523,4.566],[1.872,6.144]],"c":true},"ix":2},"nm":"Path 4","mn":"ADBE Vector Shape - Group","hd":false},{"ind":4,"ty":"sh","ix":5,"ks":{"a":0,"k":{"i":[[0.634,0],[0.435,0.425],[0,0.625],[-0.425,0.426],[-0.625,0],[-0.426,-0.425],[0,-0.617],[0.434,-0.426]],"o":[[-0.625,0],[-0.425,-0.426],[0,-0.617],[0.435,-0.425],[0.634,0],[0.434,0.426],[0,0.625],[-0.426,0.425]],"v":[[0.282,-2.561],[-1.308,-3.199],[-1.946,-4.775],[-1.308,-6.339],[0.282,-6.977],[1.872,-6.339],[2.523,-4.775],[1.872,-3.199]],"c":true},"ix":2},"nm":"Path 5","mn":"ADBE Vector Shape - Group","hd":false},{"ind":5,"ty":"sh","ix":6,"ks":{"a":0,"k":{"i":[[0.973,0],[0.616,-0.617],[0,-0.955],[-0.617,-0.616],[-0.947,0],[-0.634,0.617],[0,0.938],[0.625,0.608]],"o":[[-0.964,0],[-0.608,0.608],[0,0.93],[0.617,0.617],[0.964,0],[0.635,-0.616],[0,-0.947],[-0.626,-0.617]],"v":[[-10.885,-6.652],[-13.256,-5.727],[-14.168,-3.382],[-13.243,-1.062],[-10.898,-0.137],[-8.501,-1.062],[-7.549,-3.395],[-8.487,-5.727]],"c":true},"ix":2},"nm":"Path 6","mn":"ADBE Vector Shape - Group","hd":false},{"ind":6,"ty":"sh","ix":7,"ks":{"a":0,"k":{"i":[[-1.946,0],[-1.251,-1.225],[0,-1.876],[0.643,-1.181],[0.955,-1.294],[0,0],[0,0],[0.886,0.599],[0,0],[-0.643,0.808],[0,0],[-0.93,0.721],[-0.512,2.702],[0,0],[1.459,-1.033],[1.754,0],[1.103,1.112],[0,1.703],[-1.277,1.251]],"o":[[1.989,0],[1.251,1.216],[0,1.277],[-0.643,1.173],[0,0],[-0.573,0.765],[0,0],[-0.981,-0.678],[0,0],[0,0],[0.452,-0.591],[0.929,-0.721],[0,0],[-0.26,1.902],[-1.451,1.025],[-1.616,0],[-1.103,-1.112],[0,-1.867],[1.286,-1.26]],"v":[[-10.846,-9.818],[-5.986,-7.98],[-4.11,-3.342],[-5.074,0.344],[-7.471,4.046],[-10.872,8.697],[-11.732,9.844],[-13.061,8.945],[-14.533,7.928],[-13.569,6.717],[-11.419,3.732],[-9.347,1.766],[-7.185,-3.368],[-4.488,-3.303],[-7.067,1.1],[-11.875,2.639],[-15.953,0.971],[-17.608,-3.251],[-15.693,-7.928]],"c":true},"ix":2},"nm":"Path 7","mn":"ADBE Vector Shape - Group","hd":false},{"ind":7,"ty":"sh","ix":8,"ks":{"a":0,"k":{"i":[[-1.242,0],[-0.677,1.138],[0,2.032],[0.678,1.129],[1.251,0],[0.678,-1.138],[0,-2.024],[-0.668,-1.146]],"o":[[1.251,0],[0.678,-1.138],[0,-2.024],[-0.677,-1.138],[-1.242,0],[-0.668,1.129],[0,2.023],[0.678,1.138]],"v":[[-26.854,6.365],[-23.962,4.658],[-22.945,-0.098],[-23.962,-4.827],[-26.854,-6.535],[-29.734,-4.827],[-30.737,-0.098],[-29.734,4.658]],"c":true},"ix":2},"nm":"Path 8","mn":"ADBE Vector Shape - Group","hd":false},{"ind":8,"ty":"sh","ix":9,"ks":{"a":0,"k":{"i":[[2.267,0],[1.337,1.798],[0,2.918],[-1.329,1.789],[-2.25,0],[-1.338,-1.798],[0,-2.91],[1.338,-1.806]],"o":[[-2.25,0],[-1.329,-1.798],[0,-2.91],[1.337,-1.798],[2.267,0],[1.338,1.789],[0,2.909],[-1.338,1.798]],"v":[[-26.867,9.674],[-32.248,6.977],[-34.242,-0.098],[-32.248,-7.146],[-26.867,-9.844],[-21.46,-7.146],[-19.453,-0.098],[-21.46,6.977]],"c":true},"ix":2},"nm":"Path 9","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0.945098099054,0.701960784314,0.901960844152,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[52.574,47.013],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":11,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-6.627,0],[0,0],[0,-6.627],[0,0],[6.627,0],[0,0],[0,6.627],[0,0]],"o":[[0,0],[6.627,0],[0,0],[0,6.627],[0,0],[-6.627,0],[0,0],[0,-6.627]],"v":[[-49.5,-15.5],[49.5,-15.5],[61.5,-3.5],[61.5,3.5],[49.5,15.5],[-49.5,15.5],[-61.5,3.5],[-61.5,-3.5]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.945098099054,0.701960784314,0.901960844152,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[78.75,84.75],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-3.406,0],[0,0],[0,-3.407],[3.407,0],[0,0],[0,3.406]],"o":[[0,0],[3.407,0],[0,3.406],[0,0],[-3.406,0],[0,-3.407]],"v":[[-14.579,-6.168],[14.578,-6.168],[20.747,0],[14.578,6.168],[-14.579,6.168],[-20.747,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.945098099054,0.701960784314,0.901960844152,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[37.817,110.418],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 4","np":2,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[5.101,0],[0,0],[0,5.13],[0,0],[-5.101,0],[0,0],[0,-5.13]],"o":[[0,5.145],[0,0],[-5.101,0],[0,0],[0,-5.145],[0,0],[5.101,0],[0,0]],"v":[[70.135,151.084],[60.793,160.47],[-63.518,160.47],[-72.86,151.084],[-72.86,-109.46],[-63.518,-118.846],[60.793,-118.846],[70.135,-109.46]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,1.676],[0,0],[1.589,0.612],[0,0],[8.307,0],[0,0],[0,-8.336],[0,0],[-8.307,0],[0,0],[0,8.336],[0,0],[0,1.778],[0,0],[1.588,0.613]],"o":[[0,0],[1.603,-0.568],[0,0],[0,-1.778],[0,0],[0,-8.336],[0,0],[-8.307,0],[0,0],[0,8.336],[0,0],[8.307,0],[0,0],[1.588,-0.598],[0,0],[0,-1.778],[0,0]],"v":[[75.775,-15.767],[75.775,-35.019],[78.383,-38.895],[78.383,-49.738],[75.658,-53.673],[75.658,-109.46],[60.677,-124.5],[-63.518,-124.5],[-78.5,-109.46],[-78.5,151.084],[-63.518,166.124],[60.793,166.124],[75.775,151.084],[75.775,19.253],[78.5,15.318],[78.5,-11.862],[75.775,-15.797]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0.603921568627,0.552941176471,0.58431372549,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[78.75,124.75],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 5","np":6,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[2.468,0],[0,2.47],[-2.469,0],[0,-2.47]],"o":[[-2.469,0],[0,-2.47],[2.468,0],[0,2.47]],"v":[[0.001,-106.453],[-4.462,-110.916],[0.001,-115.379],[4.462,-110.916]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[6.573,0],[0,0],[0,-6.576],[0,0],[-6.573,0],[0,0],[0,6.575],[0,0]],"o":[[0,0],[-6.573,0],[0,0],[0,6.575],[0,0],[6.573,0],[0,0],[0,-6.576]],"v":[[60.97,-122.818],[-60.971,-122.818],[-72.868,-110.916],[-72.868,150.921],[-60.971,162.822],[60.97,162.822],[72.868,150.921],[72.868,-110.916]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0.396078461292,0.211764720842,0.380392186782,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[78.725,126.432],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 6","np":6,"cix":2,"bm":0,"ix":6,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"ct":1,"bm":0}],"markers":[],"props":{}}
\ No newline at end of file
diff --git a/res/raw-night/lottie_lock_screen_notification_minimalism_full_list.json b/res/raw-night/lottie_lock_screen_notification_minimalism_full_list.json
new file mode 100644
index 0000000..51e0925
--- /dev/null
+++ b/res/raw-night/lottie_lock_screen_notification_minimalism_full_list.json
@@ -0,0 +1 @@
+{"v":"5.12.1","fr":60,"ip":0,"op":180,"w":380,"h":277,"nm":"Dark_A2","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Dark_A2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[190.5,173.312,0],"ix":2,"l":2},"a":{"a":0,"k":[78.75,145.562,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.242,0],[-0.677,1.138],[0,2.032],[0.678,1.129],[1.251,0],[0.678,-1.138],[0,-2.024],[-0.668,-1.146]],"o":[[1.251,0],[0.678,-1.138],[0,-2.024],[-0.677,-1.138],[-1.242,0],[-0.668,1.129],[0,2.023],[0.678,1.138]],"v":[[26.841,6.365],[29.733,4.658],[30.75,-0.098],[29.733,-4.827],[26.841,-6.535],[23.961,-4.827],[22.958,-0.098],[23.961,4.658]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[2.267,0],[1.337,1.798],[0,2.918],[-1.329,1.789],[-2.25,0],[-1.338,-1.798],[0,-2.91],[1.338,-1.806]],"o":[[-2.25,0],[-1.329,-1.798],[0,-2.91],[1.337,-1.798],[2.267,0],[1.338,1.789],[0,2.909],[-1.338,1.798]],"v":[[26.828,9.674],[21.447,6.977],[19.453,-0.098],[21.447,-7.146],[26.828,-9.844],[32.235,-7.146],[34.242,-0.098],[32.235,6.977]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[1.92,0],[0.782,0.33],[0.565,0.608],[0.251,0.625],[0,0],[-0.999,0.382],[0,0],[-0.156,-0.383],[-0.296,-0.365],[-0.391,-0.2],[-0.53,0],[-0.547,0.556],[0,0.799],[0.599,0.504],[0.912,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-0.521,0.469],[0,0.782],[0.478,0.452],[0.799,0],[0.347,-0.156],[0.269,-0.286],[0.183,-0.331],[0,0],[0.912,0.495],[0,0],[-0.313,0.539],[-0.548,0.486],[-0.695,0.261],[-0.912,0],[-1.034,-0.904],[0,-1.468],[0.469,-0.73],[0.843,-0.313],[0,0],[-0.582,-0.825],[0,-1.147],[1.19,-1.077]],"o":[[-1.051,0],[-0.782,-0.338],[-0.564,-0.608],[-0.252,-0.634],[0,0],[0.999,-0.383],[0,0],[0.165,0.382],[0.304,0.356],[0.391,0.191],[0.877,0],[0.556,-0.565],[0,-0.895],[-0.6,-0.503],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0.834,0],[0.53,-0.469],[0,-0.73],[-0.469,-0.452],[-0.435,0],[-0.339,0.156],[-0.269,0.287],[-0.173,0.321],[0,0],[-0.904,-0.504],[0,0],[0.321,-0.538],[0.547,-0.487],[0.703,-0.26],[1.72,0],[1.042,0.903],[0,1.007],[-0.461,0.72],[0,0],[1.025,0.33],[0.582,0.817],[0,1.641],[-1.182,1.068]],"v":[[10.852,9.674],[8.103,9.178],[6.083,7.758],[4.859,5.909],[4.481,4.958],[5.979,4.385],[7.477,3.811],[7.712,4.385],[8.403,5.505],[9.445,6.339],[10.826,6.626],[12.963,5.792],[13.797,3.745],[12.898,1.648],[10.631,0.893],[10.044,0.893],[8.859,0.893],[8.859,-0.436],[8.859,-1.766],[10.044,-1.766],[10.448,-1.766],[12.481,-2.469],[13.276,-4.346],[12.559,-6.117],[10.657,-6.796],[9.484,-6.561],[8.572,-5.896],[7.894,-4.971],[7.634,-4.488],[6.266,-5.231],[4.911,-5.988],[5.38,-6.796],[6.683,-8.333],[8.546,-9.453],[10.969,-9.844],[15.1,-8.488],[16.663,-4.932],[15.96,-2.326],[14.005,-0.775],[14.005,-0.684],[16.416,1.049],[17.289,3.993],[15.504,8.072]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[0.634,0],[0.435,0.425],[0,0.625],[-0.425,0.426],[-0.625,0],[-0.426,-0.425],[0,-0.617],[0.434,-0.426]],"o":[[-0.625,0],[-0.425,-0.426],[0,-0.617],[0.435,-0.425],[0.634,0],[0.434,0.426],[0,0.625],[-0.426,0.425]],"v":[[0.282,6.782],[-1.308,6.144],[-1.946,4.566],[-1.308,3.003],[0.282,2.365],[1.872,3.003],[2.523,4.566],[1.872,6.144]],"c":true},"ix":2},"nm":"Path 4","mn":"ADBE Vector Shape - Group","hd":false},{"ind":4,"ty":"sh","ix":5,"ks":{"a":0,"k":{"i":[[0.634,0],[0.435,0.425],[0,0.625],[-0.425,0.426],[-0.625,0],[-0.426,-0.425],[0,-0.617],[0.434,-0.426]],"o":[[-0.625,0],[-0.425,-0.426],[0,-0.617],[0.435,-0.425],[0.634,0],[0.434,0.426],[0,0.625],[-0.426,0.425]],"v":[[0.282,-2.561],[-1.308,-3.199],[-1.946,-4.775],[-1.308,-6.339],[0.282,-6.977],[1.872,-6.339],[2.523,-4.775],[1.872,-3.199]],"c":true},"ix":2},"nm":"Path 5","mn":"ADBE Vector Shape - Group","hd":false},{"ind":5,"ty":"sh","ix":6,"ks":{"a":0,"k":{"i":[[0.973,0],[0.616,-0.617],[0,-0.955],[-0.617,-0.616],[-0.947,0],[-0.634,0.617],[0,0.938],[0.625,0.608]],"o":[[-0.964,0],[-0.608,0.608],[0,0.93],[0.617,0.617],[0.964,0],[0.635,-0.616],[0,-0.947],[-0.626,-0.617]],"v":[[-10.885,-6.652],[-13.256,-5.727],[-14.168,-3.382],[-13.243,-1.062],[-10.898,-0.137],[-8.501,-1.062],[-7.549,-3.395],[-8.487,-5.727]],"c":true},"ix":2},"nm":"Path 6","mn":"ADBE Vector Shape - Group","hd":false},{"ind":6,"ty":"sh","ix":7,"ks":{"a":0,"k":{"i":[[-1.946,0],[-1.251,-1.225],[0,-1.876],[0.643,-1.181],[0.955,-1.294],[0,0],[0,0],[0.886,0.599],[0,0],[-0.643,0.808],[0,0],[-0.93,0.721],[-0.512,2.702],[0,0],[1.459,-1.033],[1.754,0],[1.103,1.112],[0,1.703],[-1.277,1.251]],"o":[[1.989,0],[1.251,1.216],[0,1.277],[-0.643,1.173],[0,0],[-0.573,0.765],[0,0],[-0.981,-0.678],[0,0],[0,0],[0.452,-0.591],[0.929,-0.721],[0,0],[-0.26,1.902],[-1.451,1.025],[-1.616,0],[-1.103,-1.112],[0,-1.867],[1.286,-1.26]],"v":[[-10.846,-9.818],[-5.986,-7.98],[-4.11,-3.342],[-5.074,0.344],[-7.471,4.046],[-10.872,8.697],[-11.732,9.844],[-13.061,8.945],[-14.533,7.928],[-13.569,6.717],[-11.419,3.732],[-9.347,1.766],[-7.185,-3.368],[-4.488,-3.303],[-7.067,1.1],[-11.875,2.639],[-15.953,0.971],[-17.608,-3.251],[-15.693,-7.928]],"c":true},"ix":2},"nm":"Path 7","mn":"ADBE Vector Shape - Group","hd":false},{"ind":7,"ty":"sh","ix":8,"ks":{"a":0,"k":{"i":[[-1.242,0],[-0.677,1.138],[0,2.032],[0.678,1.129],[1.251,0],[0.678,-1.138],[0,-2.024],[-0.668,-1.146]],"o":[[1.251,0],[0.678,-1.138],[0,-2.024],[-0.677,-1.138],[-1.242,0],[-0.668,1.129],[0,2.023],[0.678,1.138]],"v":[[-26.854,6.365],[-23.962,4.658],[-22.945,-0.098],[-23.962,-4.827],[-26.854,-6.535],[-29.734,-4.827],[-30.737,-0.098],[-29.734,4.658]],"c":true},"ix":2},"nm":"Path 8","mn":"ADBE Vector Shape - Group","hd":false},{"ind":8,"ty":"sh","ix":9,"ks":{"a":0,"k":{"i":[[2.267,0],[1.337,1.798],[0,2.918],[-1.329,1.789],[-2.25,0],[-1.338,-1.798],[0,-2.91],[1.338,-1.806]],"o":[[-2.25,0],[-1.329,-1.798],[0,-2.91],[1.337,-1.798],[2.267,0],[1.338,1.789],[0,2.909],[-1.338,1.798]],"v":[[-26.867,9.674],[-32.248,6.977],[-34.242,-0.098],[-32.248,-7.146],[-26.867,-9.844],[-21.46,-7.146],[-19.453,-0.098],[-21.46,6.977]],"c":true},"ix":2},"nm":"Path 9","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0.945098099054,0.701960784314,0.901960844152,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[52.574,47.013],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":11,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-6.627,0],[0,0],[0,-6.627],[0,0],[6.627,0],[0,0],[0,6.627],[0,0]],"o":[[0,0],[6.627,0],[0,0],[0,6.627],[0,0],[-6.627,0],[0,0],[0,-6.627]],"v":[[-44.072,-15.7],[44.072,-15.7],[56.072,-3.7],[56.072,3.7],[44.072,15.7],[-44.072,15.7],[-56.072,3.7],[-56.072,-3.7]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.945098099054,0.701960784314,0.901960844152,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[73.142,85.95],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-4.955,0],[0,0],[0,-4.954],[0,0],[4.955,0],[0,0],[0,4.954],[0,0]],"o":[[0,0],[4.955,0],[0,0],[0,4.954],[0,0],[-4.955,0],[0,0],[0,-4.954]],"v":[[-47.101,-15.7],[47.1,-15.7],[56.072,-6.729],[56.072,6.729],[47.1,15.7],[-47.101,15.7],[-56.072,6.729],[-56.072,-6.729]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.945098099054,0.701960784314,0.901960844152,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[73.143,123.35],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-4.955,0],[0,0],[0,-4.954],[0,0],[4.955,0],[0,0],[0,4.954],[0,0]],"o":[[0,0],[4.955,0],[0,0],[0,4.954],[0,0],[-4.955,0],[0,0],[0,-4.954]],"v":[[-47.101,-15.7],[47.1,-15.7],[56.072,-6.729],[56.072,6.729],[47.1,15.7],[-47.101,15.7],[-56.072,6.729],[-56.072,-6.729]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.945098099054,0.701960784314,0.901960844152,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[73.143,160.75],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 4","np":2,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-3.406,0],[0,0],[0,-3.407],[3.407,0],[0,0],[0,3.406]],"o":[[0,0],[3.407,0],[0,3.406],[0,0],[-3.406,0],[0,-3.407]],"v":[[-14.579,-6.168],[14.578,-6.168],[20.747,0],[14.578,6.168],[-14.579,6.168],[-20.747,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.945098099054,0.701960784314,0.901960844152,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[37.818,190.332],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 5","np":2,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[5.101,0],[0,0],[0,5.13],[0,0],[-5.101,0],[0,0],[0,-5.13]],"o":[[0,5.145],[0,0],[-5.101,0],[0,0],[0,-5.145],[0,0],[5.101,0],[0,0]],"v":[[70.135,151.084],[60.793,160.47],[-63.518,160.47],[-72.86,151.084],[-72.86,-109.46],[-63.518,-118.846],[60.793,-118.846],[70.135,-109.46]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,1.676],[0,0],[1.589,0.612],[0,0],[8.307,0],[0,0],[0,-8.336],[0,0],[-8.307,0],[0,0],[0,8.336],[0,0],[0,1.778],[0,0],[1.588,0.613]],"o":[[0,0],[1.603,-0.568],[0,0],[0,-1.778],[0,0],[0,-8.336],[0,0],[-8.307,0],[0,0],[0,8.336],[0,0],[8.307,0],[0,0],[1.588,-0.598],[0,0],[0,-1.778],[0,0]],"v":[[75.775,-15.767],[75.775,-35.019],[78.383,-38.895],[78.383,-49.738],[75.658,-53.673],[75.658,-109.46],[60.677,-124.5],[-63.518,-124.5],[-78.5,-109.46],[-78.5,151.084],[-63.518,166.124],[60.793,166.124],[75.775,151.084],[75.775,19.253],[78.5,15.318],[78.5,-11.862],[75.775,-15.797]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0.603921568627,0.552941176471,0.58431372549,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[78.75,124.75],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 6","np":6,"cix":2,"bm":0,"ix":6,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[2.468,0],[0,2.47],[-2.469,0],[0,-2.47]],"o":[[-2.469,0],[0,-2.47],[2.468,0],[0,2.47]],"v":[[0.001,-106.453],[-4.462,-110.916],[0.001,-115.379],[4.462,-110.916]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[6.573,0],[0,0],[0,-6.576],[0,0],[-6.573,0],[0,0],[0,6.575],[0,0]],"o":[[0,0],[-6.573,0],[0,0],[0,6.575],[0,0],[6.573,0],[0,0],[0,-6.576]],"v":[[60.97,-122.818],[-60.971,-122.818],[-72.868,-110.916],[-72.868,150.921],[-60.971,162.822],[60.97,162.822],[72.868,150.921],[72.868,-110.916]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0.396078461292,0.211764720842,0.380392186782,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[78.725,126.432],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 7","np":6,"cix":2,"bm":0,"ix":7,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"ct":1,"bm":0}],"markers":[],"props":{}}
\ No newline at end of file
diff --git a/res/raw-sw600dp-night/lottie_lock_screen_notification_minimalism_compact_view.json b/res/raw-sw600dp-night/lottie_lock_screen_notification_minimalism_compact_view.json
new file mode 100644
index 0000000..a5696cc
--- /dev/null
+++ b/res/raw-sw600dp-night/lottie_lock_screen_notification_minimalism_compact_view.json
@@ -0,0 +1 @@
+{"v":"5.12.1","fr":60,"ip":0,"op":180,"w":380,"h":277,"nm":"Light_B2","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Light_B2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[190.643,138.62,0],"ix":2,"l":2},"a":{"a":0,"k":[155.643,99.62,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-4.951,0],[0,0],[0,-4.951],[0,0],[4.951,0],[0,0],[0,4.951],[0,0]],"o":[[0,0],[4.951,0],[0,0],[0,4.951],[0,0],[-4.951,0],[0,0],[0,-4.951]],"v":[[-56.59,-15.688],[56.591,-15.688],[65.555,-6.723],[65.555,6.724],[56.591,15.688],[-56.59,15.688],[-65.555,6.724],[-65.555,-6.723]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.945098099054,0.701960784314,0.901960844152,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[225.554,43.688],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-5.247,0],[0,0],[0,-5.247],[5.247,0],[0,0],[0,5.247]],"o":[[0,0],[5.247,0],[0,5.247],[0,0],[-5.247,0],[0,-5.247]],"v":[[-14,-9.5],[14,-9.5],[23.5,0],[14,9.5],[-14,9.5],[-23.5,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.945098099054,0.701960784314,0.901960844152,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[183.5,76.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.144,0],[-0.616,1.048],[0,1.872],[0.624,1.04],[1.16,0],[0.624,-1.048],[0,-1.864],[-0.616,-1.056]],"o":[[1.16,0],[0.624,-1.048],[0,-1.864],[-0.616,-1.048],[-1.144,0],[-0.616,1.04],[0,1.864],[0.624,1.048]],"v":[[24.715,5.856],[27.379,4.284],[28.314,-0.096],[27.379,-4.452],[24.715,-6.024],[22.062,-4.452],[21.139,-0.096],[22.062,4.284]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[2.088,0],[1.232,1.656],[0,2.688],[-1.224,1.648],[-2.072,0],[-1.232,-1.656],[0,-2.68],[1.24,-1.656]],"o":[[-2.072,0],[-1.224,-1.656],[0,-2.68],[1.232,-1.656],[2.088,0],[1.24,1.648],[0,2.688],[-1.232,1.656]],"v":[[24.702,8.904],[19.747,6.42],[17.911,-0.096],[19.747,-6.588],[24.702,-9.072],[29.683,-6.588],[31.543,-0.096],[29.683,6.42]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[1.768,0],[0.72,0.304],[0.52,0.56],[0.232,0.576],[0,0],[-0.92,0.352],[0,0],[-0.144,-0.352],[-0.272,-0.336],[-0.36,-0.184],[-0.488,0],[-0.504,0.512],[0,0.736],[0.552,0.464],[0.84,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-0.48,0.432],[0,0.72],[0.432,0.416],[0.736,0],[0.32,-0.144],[0.248,-0.264],[0.168,-0.304],[0,0],[0,0],[0,0],[-0.288,0.496],[-0.504,0.448],[-0.64,0.232],[-0.832,0],[-0.952,-0.832],[0,-1.352],[0.432,-0.672],[0.776,-0.288],[0,0],[-0.536,-0.752],[0,-1.056],[1.096,-0.992]],"o":[[-0.968,0],[-0.72,-0.304],[-0.52,-0.568],[-0.232,-0.584],[0,0],[0.92,-0.352],[0,0],[0.152,0.352],[0.28,0.328],[0.36,0.176],[0.808,0],[0.512,-0.52],[0,-0.824],[-0.552,-0.464],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0.76,0],[0.488,-0.432],[0,-0.672],[-0.432,-0.416],[-0.4,0],[-0.312,0.144],[-0.248,0.256],[-0.16,0.304],[0,0],[-0.832,-0.464],[0,0],[0.296,-0.496],[0.512,-0.448],[0.648,-0.24],[1.584,0],[0.96,0.832],[0,0.928],[-0.424,0.664],[0,0],[0.944,0.312],[0.536,0.752],[0,1.512],[-1.088,0.984]],"v":[[10.013,8.904],[7.48,8.448],[5.62,7.152],[4.493,5.436],[4.145,4.56],[5.525,4.032],[6.905,3.504],[7.12,4.032],[7.757,5.064],[8.717,5.832],[9.989,6.096],[11.956,5.328],[12.725,3.444],[11.896,1.512],[9.809,0.816],[9.281,0.816],[8.176,0.816],[8.176,-0.408],[8.176,-1.632],[9.281,-1.632],[9.641,-1.632],[11.501,-2.28],[12.232,-4.008],[11.585,-5.64],[9.833,-6.264],[8.753,-6.048],[7.913,-5.436],[7.288,-4.596],[7.049,-4.14],[5.788,-4.836],[4.541,-5.532],[4.973,-6.276],[6.173,-7.692],[7.901,-8.712],[10.12,-9.072],[13.924,-7.824],[15.365,-4.548],[14.717,-2.148],[12.917,-0.72],[12.917,-0.636],[15.137,0.96],[15.941,3.672],[14.297,7.428]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[0.576,0],[0.4,0.392],[0,0.576],[-0.4,0.392],[-0.576,0],[-0.392,-0.392],[0,-0.568],[0.4,-0.392]],"o":[[-0.576,0],[-0.4,-0.392],[0,-0.568],[0.4,-0.392],[0.576,0],[0.4,0.392],[0,0.576],[-0.392,0.392]],"v":[[0.289,6.24],[-1.174,5.652],[-1.775,4.2],[-1.174,2.76],[0.289,2.172],[1.742,2.76],[2.342,4.2],[1.742,5.652]],"c":true},"ix":2},"nm":"Path 4","mn":"ADBE Vector Shape - Group","hd":false},{"ind":4,"ty":"sh","ix":5,"ks":{"a":0,"k":{"i":[[0.576,0],[0.4,0.392],[0,0.576],[-0.392,0.392],[-0.576,0],[-0.392,-0.392],[0,-0.568],[0.4,-0.392]],"o":[[-0.576,0],[-0.392,-0.392],[0,-0.568],[0.4,-0.392],[0.576,0],[0.4,0.392],[0,0.576],[-0.392,0.392]],"v":[[0.29,-2.364],[-1.174,-2.952],[-1.762,-4.404],[-1.174,-5.844],[0.29,-6.432],[1.742,-5.844],[2.342,-4.404],[1.742,-2.952]],"c":true},"ix":2},"nm":"Path 5","mn":"ADBE Vector Shape - Group","hd":false},{"ind":5,"ty":"sh","ix":6,"ks":{"a":0,"k":{"i":[[0.888,0],[0.56,-0.568],[0,-0.88],[-0.56,-0.568],[-0.872,0],[-0.584,0.568],[0,0.864],[0.576,0.56]],"o":[[-0.888,0],[-0.56,0.56],[0,0.856],[0.568,0.568],[0.88,0],[0.584,-0.568],[0,-0.872],[-0.576,-0.568]],"v":[[-10.008,-6.132],[-12.18,-5.28],[-13.02,-3.12],[-12.18,-0.984],[-10.02,-0.132],[-7.824,-0.984],[-6.948,-3.132],[-7.812,-5.28]],"c":true},"ix":2},"nm":"Path 6","mn":"ADBE Vector Shape - Group","hd":false},{"ind":6,"ty":"sh","ix":7,"ks":{"a":0,"k":{"i":[[-1.792,0],[-1.152,-1.128],[0,-1.72],[0.6,-1.088],[0.88,-1.184],[0,0],[0,0],[0.816,0.56],[0,0],[-0.592,0.736],[0,0],[-0.848,0.664],[-0.472,2.496],[0,0],[1.344,-0.952],[1.624,0],[1.016,1.024],[0,1.568],[-1.176,1.152]],"o":[[1.824,0],[1.16,1.12],[0,1.184],[-0.592,1.088],[0,0],[-0.528,0.712],[0,0],[-0.904,-0.624],[0,0],[0,0],[0.416,-0.544],[0.856,-0.664],[0,0],[-0.232,1.752],[-1.336,0.944],[-1.488,0],[-1.016,-1.024],[0,-1.72],[1.184,-1.16]],"v":[[-9.972,-9.048],[-5.508,-7.356],[-3.768,-3.096],[-4.668,0.312],[-6.876,3.72],[-9.995,8.004],[-10.788,9.072],[-12.012,8.232],[-13.368,7.296],[-12.48,6.192],[-10.5,3.432],[-8.604,1.62],[-6.612,-3.12],[-4.116,-3.048],[-6.48,1.008],[-10.92,2.424],[-14.676,0.888],[-16.2,-3],[-14.436,-7.308]],"c":true},"ix":2},"nm":"Path 7","mn":"ADBE Vector Shape - Group","hd":false},{"ind":7,"ty":"sh","ix":8,"ks":{"a":0,"k":{"i":[[-1.144,0],[-0.616,1.048],[0,1.872],[0.624,1.04],[1.16,0],[0.624,-1.048],[0,-1.864],[-0.616,-1.056]],"o":[[1.16,0],[0.624,-1.048],[0,-1.864],[-0.616,-1.048],[-1.144,0],[-0.616,1.04],[0,1.864],[0.624,1.048]],"v":[[-24.739,5.856],[-22.075,4.284],[-21.139,-0.096],[-22.075,-4.452],[-24.739,-6.024],[-27.391,-4.452],[-28.314,-0.096],[-27.391,4.284]],"c":true},"ix":2},"nm":"Path 8","mn":"ADBE Vector Shape - Group","hd":false},{"ind":8,"ty":"sh","ix":9,"ks":{"a":0,"k":{"i":[[2.088,0],[1.232,1.656],[0,2.688],[-1.224,1.648],[-2.072,0],[-1.232,-1.656],[0,-2.68],[1.24,-1.656]],"o":[[-2.072,0],[-1.224,-1.656],[0,-2.68],[1.232,-1.656],[2.088,0],[1.24,1.648],[0,2.688],[-1.232,1.656]],"v":[[-24.751,8.904],[-29.706,6.42],[-31.542,-0.096],[-29.706,-6.588],[-24.751,-9.072],[-19.771,-6.588],[-17.911,-0.096],[-19.771,6.42]],"c":true},"ix":2},"nm":"Path 9","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0.945098099054,0.701960784314,0.901960844152,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[53.996,34.492],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":11,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-5.28,0],[0,0],[0,-5.28],[0,0],[5.28,0],[0,0],[0,5.28],[0,0]],"o":[[0,0],[5.28,0],[0,0],[0,5.28],[0,0],[-5.28,0],[0,0],[0,-5.28]],"v":[[-141.601,-95.138],[141.601,-95.138],[151.161,-85.578],[151.161,85.578],[141.601,95.138],[-141.601,95.138],[-151.161,85.578],[-151.161,-85.578]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.603921568627,0.552941176471,0.58431372549,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":4.482,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[155.643,99.62],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 4","np":2,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-149.599,-94.689],[149.599,-94.689],[149.599,94.689],[-149.599,94.689]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.396078461292,0.211764720842,0.380392186782,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[155.201,99.171],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 5","np":2,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"ct":1,"bm":0}],"markers":[],"props":{}}
\ No newline at end of file
diff --git a/res/raw-sw600dp-night/lottie_lock_screen_notification_minimalism_full_list.json b/res/raw-sw600dp-night/lottie_lock_screen_notification_minimalism_full_list.json
new file mode 100644
index 0000000..135e26a
--- /dev/null
+++ b/res/raw-sw600dp-night/lottie_lock_screen_notification_minimalism_full_list.json
@@ -0,0 +1 @@
+{"v":"5.12.1","fr":60,"ip":0,"op":180,"w":380,"h":277,"nm":"Dark_B2","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Dark_B2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[190.643,138.62,0],"ix":2,"l":2},"a":{"a":0,"k":[155.643,99.62,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-4.951,0],[0,0],[0,-4.951],[0,0],[4.951,0],[0,0],[0,4.951],[0,0]],"o":[[0,0],[4.951,0],[0,0],[0,4.951],[0,0],[-4.951,0],[0,0],[0,-4.951]],"v":[[-56.59,-15.688],[56.591,-15.688],[65.555,-6.723],[65.555,6.724],[56.591,15.688],[-56.59,15.688],[-65.555,6.724],[-65.555,-6.723]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.945098099054,0.701960784314,0.901960844152,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[224.554,89.688],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-9.283,0],[0,0],[0,-9.283],[0,0],[9.284,0],[0,0],[0,9.283],[0,0]],"o":[[0,0],[9.284,0],[0,0],[0,9.283],[0,0],[-9.283,0],[0,0],[0,-9.283]],"v":[[-48.691,-21.5],[48.691,-21.5],[65.5,-4.691],[65.5,4.691],[48.691,21.5],[-48.691,21.5],[-65.5,4.691],[-65.5,-4.691]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.945098099054,0.701960784314,0.901960844152,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[224.5,47.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-5.247,0],[0,0],[0,-5.247],[5.247,0],[0,0],[0,5.247]],"o":[[0,0],[5.247,0],[0,5.247],[0,0],[-5.247,0],[0,-5.247]],"v":[[-14,-9.5],[14,-9.5],[23.5,0],[14,9.5],[-14,9.5],[-23.5,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.945098099054,0.701960784314,0.901960844152,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[182.5,122.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.144,0],[-0.616,1.048],[0,1.872],[0.624,1.04],[1.16,0],[0.624,-1.048],[0,-1.864],[-0.616,-1.056]],"o":[[1.16,0],[0.624,-1.048],[0,-1.864],[-0.616,-1.048],[-1.144,0],[-0.616,1.04],[0,1.864],[0.624,1.048]],"v":[[24.715,5.856],[27.379,4.284],[28.314,-0.096],[27.379,-4.452],[24.715,-6.024],[22.062,-4.452],[21.139,-0.096],[22.062,4.284]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[2.088,0],[1.232,1.656],[0,2.688],[-1.224,1.648],[-2.072,0],[-1.232,-1.656],[0,-2.68],[1.24,-1.656]],"o":[[-2.072,0],[-1.224,-1.656],[0,-2.68],[1.232,-1.656],[2.088,0],[1.24,1.648],[0,2.688],[-1.232,1.656]],"v":[[24.702,8.904],[19.747,6.42],[17.911,-0.096],[19.747,-6.588],[24.702,-9.072],[29.683,-6.588],[31.543,-0.096],[29.683,6.42]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[1.768,0],[0.72,0.304],[0.52,0.56],[0.232,0.576],[0,0],[-0.92,0.352],[0,0],[-0.144,-0.352],[-0.272,-0.336],[-0.36,-0.184],[-0.488,0],[-0.504,0.512],[0,0.736],[0.552,0.464],[0.84,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-0.48,0.432],[0,0.72],[0.432,0.416],[0.736,0],[0.32,-0.144],[0.248,-0.264],[0.168,-0.304],[0,0],[0,0],[0,0],[-0.288,0.496],[-0.504,0.448],[-0.64,0.232],[-0.832,0],[-0.952,-0.832],[0,-1.352],[0.432,-0.672],[0.776,-0.288],[0,0],[-0.536,-0.752],[0,-1.056],[1.096,-0.992]],"o":[[-0.968,0],[-0.72,-0.304],[-0.52,-0.568],[-0.232,-0.584],[0,0],[0.92,-0.352],[0,0],[0.152,0.352],[0.28,0.328],[0.36,0.176],[0.808,0],[0.512,-0.52],[0,-0.824],[-0.552,-0.464],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0.76,0],[0.488,-0.432],[0,-0.672],[-0.432,-0.416],[-0.4,0],[-0.312,0.144],[-0.248,0.256],[-0.16,0.304],[0,0],[-0.832,-0.464],[0,0],[0.296,-0.496],[0.512,-0.448],[0.648,-0.24],[1.584,0],[0.96,0.832],[0,0.928],[-0.424,0.664],[0,0],[0.944,0.312],[0.536,0.752],[0,1.512],[-1.088,0.984]],"v":[[10.013,8.904],[7.48,8.448],[5.62,7.152],[4.493,5.436],[4.145,4.56],[5.525,4.032],[6.905,3.504],[7.12,4.032],[7.757,5.064],[8.717,5.832],[9.989,6.096],[11.956,5.328],[12.725,3.444],[11.896,1.512],[9.809,0.816],[9.281,0.816],[8.176,0.816],[8.176,-0.408],[8.176,-1.632],[9.281,-1.632],[9.641,-1.632],[11.501,-2.28],[12.232,-4.008],[11.585,-5.64],[9.833,-6.264],[8.753,-6.048],[7.913,-5.436],[7.288,-4.596],[7.049,-4.14],[5.788,-4.836],[4.541,-5.532],[4.973,-6.276],[6.173,-7.692],[7.901,-8.712],[10.12,-9.072],[13.924,-7.824],[15.365,-4.548],[14.717,-2.148],[12.917,-0.72],[12.917,-0.636],[15.137,0.96],[15.941,3.672],[14.297,7.428]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[0.576,0],[0.4,0.392],[0,0.576],[-0.4,0.392],[-0.576,0],[-0.392,-0.392],[0,-0.568],[0.4,-0.392]],"o":[[-0.576,0],[-0.4,-0.392],[0,-0.568],[0.4,-0.392],[0.576,0],[0.4,0.392],[0,0.576],[-0.392,0.392]],"v":[[0.289,6.24],[-1.174,5.652],[-1.775,4.2],[-1.174,2.76],[0.289,2.172],[1.742,2.76],[2.342,4.2],[1.742,5.652]],"c":true},"ix":2},"nm":"Path 4","mn":"ADBE Vector Shape - Group","hd":false},{"ind":4,"ty":"sh","ix":5,"ks":{"a":0,"k":{"i":[[0.576,0],[0.4,0.392],[0,0.576],[-0.392,0.392],[-0.576,0],[-0.392,-0.392],[0,-0.568],[0.4,-0.392]],"o":[[-0.576,0],[-0.392,-0.392],[0,-0.568],[0.4,-0.392],[0.576,0],[0.4,0.392],[0,0.576],[-0.392,0.392]],"v":[[0.29,-2.364],[-1.174,-2.952],[-1.762,-4.404],[-1.174,-5.844],[0.29,-6.432],[1.742,-5.844],[2.342,-4.404],[1.742,-2.952]],"c":true},"ix":2},"nm":"Path 5","mn":"ADBE Vector Shape - Group","hd":false},{"ind":5,"ty":"sh","ix":6,"ks":{"a":0,"k":{"i":[[0.888,0],[0.56,-0.568],[0,-0.88],[-0.56,-0.568],[-0.872,0],[-0.584,0.568],[0,0.864],[0.576,0.56]],"o":[[-0.888,0],[-0.56,0.56],[0,0.856],[0.568,0.568],[0.88,0],[0.584,-0.568],[0,-0.872],[-0.576,-0.568]],"v":[[-10.008,-6.132],[-12.18,-5.28],[-13.02,-3.12],[-12.18,-0.984],[-10.02,-0.132],[-7.824,-0.984],[-6.948,-3.132],[-7.812,-5.28]],"c":true},"ix":2},"nm":"Path 6","mn":"ADBE Vector Shape - Group","hd":false},{"ind":6,"ty":"sh","ix":7,"ks":{"a":0,"k":{"i":[[-1.792,0],[-1.152,-1.128],[0,-1.72],[0.6,-1.088],[0.88,-1.184],[0,0],[0,0],[0.816,0.56],[0,0],[-0.592,0.736],[0,0],[-0.848,0.664],[-0.472,2.496],[0,0],[1.344,-0.952],[1.624,0],[1.016,1.024],[0,1.568],[-1.176,1.152]],"o":[[1.824,0],[1.16,1.12],[0,1.184],[-0.592,1.088],[0,0],[-0.528,0.712],[0,0],[-0.904,-0.624],[0,0],[0,0],[0.416,-0.544],[0.856,-0.664],[0,0],[-0.232,1.752],[-1.336,0.944],[-1.488,0],[-1.016,-1.024],[0,-1.72],[1.184,-1.16]],"v":[[-9.972,-9.048],[-5.508,-7.356],[-3.768,-3.096],[-4.668,0.312],[-6.876,3.72],[-9.995,8.004],[-10.788,9.072],[-12.012,8.232],[-13.368,7.296],[-12.48,6.192],[-10.5,3.432],[-8.604,1.62],[-6.612,-3.12],[-4.116,-3.048],[-6.48,1.008],[-10.92,2.424],[-14.676,0.888],[-16.2,-3],[-14.436,-7.308]],"c":true},"ix":2},"nm":"Path 7","mn":"ADBE Vector Shape - Group","hd":false},{"ind":7,"ty":"sh","ix":8,"ks":{"a":0,"k":{"i":[[-1.144,0],[-0.616,1.048],[0,1.872],[0.624,1.04],[1.16,0],[0.624,-1.048],[0,-1.864],[-0.616,-1.056]],"o":[[1.16,0],[0.624,-1.048],[0,-1.864],[-0.616,-1.048],[-1.144,0],[-0.616,1.04],[0,1.864],[0.624,1.048]],"v":[[-24.739,5.856],[-22.075,4.284],[-21.139,-0.096],[-22.075,-4.452],[-24.739,-6.024],[-27.391,-4.452],[-28.314,-0.096],[-27.391,4.284]],"c":true},"ix":2},"nm":"Path 8","mn":"ADBE Vector Shape - Group","hd":false},{"ind":8,"ty":"sh","ix":9,"ks":{"a":0,"k":{"i":[[2.088,0],[1.232,1.656],[0,2.688],[-1.224,1.648],[-2.072,0],[-1.232,-1.656],[0,-2.68],[1.24,-1.656]],"o":[[-2.072,0],[-1.224,-1.656],[0,-2.68],[1.232,-1.656],[2.088,0],[1.24,1.648],[0,2.688],[-1.232,1.656]],"v":[[-24.751,8.904],[-29.706,6.42],[-31.542,-0.096],[-29.706,-6.588],[-24.751,-9.072],[-19.771,-6.588],[-17.911,-0.096],[-19.771,6.42]],"c":true},"ix":2},"nm":"Path 9","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0.945098099054,0.701960784314,0.901960844152,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[53.996,34.492],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 4","np":11,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-5.28,0],[0,0],[0,-5.28],[0,0],[5.28,0],[0,0],[0,5.28],[0,0]],"o":[[0,0],[5.28,0],[0,0],[0,5.28],[0,0],[-5.28,0],[0,0],[0,-5.28]],"v":[[-141.601,-95.138],[141.601,-95.138],[151.161,-85.578],[151.161,85.578],[141.601,95.138],[-141.601,95.138],[-151.161,85.578],[-151.161,-85.578]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.603921568627,0.552941176471,0.58431372549,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":4.482,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[155.643,99.62],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 5","np":2,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-149.599,-94.689],[149.599,-94.689],[149.599,94.689],[-149.599,94.689]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.396078461292,0.211764720842,0.380392186782,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[155.201,99.171],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 6","np":2,"cix":2,"bm":0,"ix":6,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"ct":1,"bm":0}],"markers":[],"props":{}}
\ No newline at end of file
diff --git a/res/raw-sw600dp/lottie_lock_screen_notification_minimalism_compact_view.json b/res/raw-sw600dp/lottie_lock_screen_notification_minimalism_compact_view.json
new file mode 100644
index 0000000..113ea63
--- /dev/null
+++ b/res/raw-sw600dp/lottie_lock_screen_notification_minimalism_compact_view.json
@@ -0,0 +1 @@
+{"v":"5.12.1","fr":60,"ip":0,"op":180,"w":380,"h":277,"nm":"Light_B1","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Light_B1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[190.643,138.62,0],"ix":2,"l":2},"a":{"a":0,"k":[155.643,99.62,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-8.284,0],[0,0],[0,-8.284],[8.284,0],[0,0],[0,8.284]],"o":[[0,0],[8.284,0],[0,8.284],[0,0],[-8.284,0],[0,-8.284]],"v":[[-50.5,-15],[50.5,-15],[65.5,0],[50.5,15],[-50.5,15],[-65.5,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.819607902976,0.725490196078,0.796078491211,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[225.5,40.812],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-5.247,0],[0,0],[0,-5.247],[5.247,0],[0,0],[0,5.247]],"o":[[0,0],[5.247,0],[0,5.247],[0,0],[-5.247,0],[0,-5.247]],"v":[[-14,-9.5],[14,-9.5],[23.5,0],[14,9.5],[-14,9.5],[-23.5,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.819607902976,0.725490196078,0.796078491211,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[183.5,70.312],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.144,0],[-0.616,1.048],[0,1.872],[0.624,1.04],[1.16,0],[0.624,-1.048],[0,-1.864],[-0.616,-1.056]],"o":[[1.16,0],[0.624,-1.048],[0,-1.864],[-0.616,-1.048],[-1.144,0],[-0.616,1.04],[0,1.864],[0.624,1.048]],"v":[[24.715,5.856],[27.379,4.284],[28.314,-0.096],[27.379,-4.452],[24.715,-6.024],[22.062,-4.452],[21.139,-0.096],[22.062,4.284]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[2.088,0],[1.232,1.656],[0,2.688],[-1.224,1.648],[-2.072,0],[-1.232,-1.656],[0,-2.68],[1.24,-1.656]],"o":[[-2.072,0],[-1.224,-1.656],[0,-2.68],[1.232,-1.656],[2.088,0],[1.24,1.648],[0,2.688],[-1.232,1.656]],"v":[[24.702,8.904],[19.747,6.42],[17.911,-0.096],[19.747,-6.588],[24.702,-9.072],[29.683,-6.588],[31.543,-0.096],[29.683,6.42]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[1.768,0],[0.72,0.304],[0.52,0.56],[0.232,0.576],[0,0],[-0.92,0.352],[0,0],[-0.144,-0.352],[-0.272,-0.336],[-0.36,-0.184],[-0.488,0],[-0.504,0.512],[0,0.736],[0.552,0.464],[0.84,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-0.48,0.432],[0,0.72],[0.432,0.416],[0.736,0],[0.32,-0.144],[0.248,-0.264],[0.168,-0.304],[0,0],[0,0],[0,0],[-0.288,0.496],[-0.504,0.448],[-0.64,0.232],[-0.832,0],[-0.952,-0.832],[0,-1.352],[0.432,-0.672],[0.776,-0.288],[0,0],[-0.536,-0.752],[0,-1.056],[1.096,-0.992]],"o":[[-0.968,0],[-0.72,-0.304],[-0.52,-0.568],[-0.232,-0.584],[0,0],[0.92,-0.352],[0,0],[0.152,0.352],[0.28,0.328],[0.36,0.176],[0.808,0],[0.512,-0.52],[0,-0.824],[-0.552,-0.464],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0.76,0],[0.488,-0.432],[0,-0.672],[-0.432,-0.416],[-0.4,0],[-0.312,0.144],[-0.248,0.256],[-0.16,0.304],[0,0],[-0.832,-0.464],[0,0],[0.296,-0.496],[0.512,-0.448],[0.648,-0.24],[1.584,0],[0.96,0.832],[0,0.928],[-0.424,0.664],[0,0],[0.944,0.312],[0.536,0.752],[0,1.512],[-1.088,0.984]],"v":[[10.013,8.904],[7.48,8.448],[5.62,7.152],[4.493,5.436],[4.145,4.56],[5.525,4.032],[6.905,3.504],[7.12,4.032],[7.757,5.064],[8.717,5.832],[9.989,6.096],[11.956,5.328],[12.725,3.444],[11.896,1.512],[9.809,0.816],[9.281,0.816],[8.176,0.816],[8.176,-0.408],[8.176,-1.632],[9.281,-1.632],[9.641,-1.632],[11.501,-2.28],[12.232,-4.008],[11.585,-5.64],[9.833,-6.264],[8.753,-6.048],[7.913,-5.436],[7.288,-4.596],[7.049,-4.14],[5.788,-4.836],[4.541,-5.532],[4.973,-6.276],[6.173,-7.692],[7.901,-8.712],[10.12,-9.072],[13.924,-7.824],[15.365,-4.548],[14.717,-2.148],[12.917,-0.72],[12.917,-0.636],[15.137,0.96],[15.941,3.672],[14.297,7.428]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[0.576,0],[0.4,0.392],[0,0.576],[-0.4,0.392],[-0.576,0],[-0.392,-0.392],[0,-0.568],[0.4,-0.392]],"o":[[-0.576,0],[-0.4,-0.392],[0,-0.568],[0.4,-0.392],[0.576,0],[0.4,0.392],[0,0.576],[-0.392,0.392]],"v":[[0.289,6.24],[-1.174,5.652],[-1.775,4.2],[-1.174,2.76],[0.289,2.172],[1.742,2.76],[2.342,4.2],[1.742,5.652]],"c":true},"ix":2},"nm":"Path 4","mn":"ADBE Vector Shape - Group","hd":false},{"ind":4,"ty":"sh","ix":5,"ks":{"a":0,"k":{"i":[[0.576,0],[0.4,0.392],[0,0.576],[-0.392,0.392],[-0.576,0],[-0.392,-0.392],[0,-0.568],[0.4,-0.392]],"o":[[-0.576,0],[-0.392,-0.392],[0,-0.568],[0.4,-0.392],[0.576,0],[0.4,0.392],[0,0.576],[-0.392,0.392]],"v":[[0.29,-2.364],[-1.174,-2.952],[-1.762,-4.404],[-1.174,-5.844],[0.29,-6.432],[1.742,-5.844],[2.342,-4.404],[1.742,-2.952]],"c":true},"ix":2},"nm":"Path 5","mn":"ADBE Vector Shape - Group","hd":false},{"ind":5,"ty":"sh","ix":6,"ks":{"a":0,"k":{"i":[[0.888,0],[0.56,-0.568],[0,-0.88],[-0.56,-0.568],[-0.872,0],[-0.584,0.568],[0,0.864],[0.576,0.56]],"o":[[-0.888,0],[-0.56,0.56],[0,0.856],[0.568,0.568],[0.88,0],[0.584,-0.568],[0,-0.872],[-0.576,-0.568]],"v":[[-10.008,-6.132],[-12.18,-5.28],[-13.02,-3.12],[-12.18,-0.984],[-10.02,-0.132],[-7.824,-0.984],[-6.948,-3.132],[-7.812,-5.28]],"c":true},"ix":2},"nm":"Path 6","mn":"ADBE Vector Shape - Group","hd":false},{"ind":6,"ty":"sh","ix":7,"ks":{"a":0,"k":{"i":[[-1.792,0],[-1.152,-1.128],[0,-1.72],[0.6,-1.088],[0.88,-1.184],[0,0],[0,0],[0.816,0.56],[0,0],[-0.592,0.736],[0,0],[-0.848,0.664],[-0.472,2.496],[0,0],[1.344,-0.952],[1.624,0],[1.016,1.024],[0,1.568],[-1.176,1.152]],"o":[[1.824,0],[1.16,1.12],[0,1.184],[-0.592,1.088],[0,0],[-0.528,0.712],[0,0],[-0.904,-0.624],[0,0],[0,0],[0.416,-0.544],[0.856,-0.664],[0,0],[-0.232,1.752],[-1.336,0.944],[-1.488,0],[-1.016,-1.024],[0,-1.72],[1.184,-1.16]],"v":[[-9.972,-9.048],[-5.508,-7.356],[-3.768,-3.096],[-4.668,0.312],[-6.876,3.72],[-9.995,8.004],[-10.788,9.072],[-12.012,8.232],[-13.368,7.296],[-12.48,6.192],[-10.5,3.432],[-8.604,1.62],[-6.612,-3.12],[-4.116,-3.048],[-6.48,1.008],[-10.92,2.424],[-14.676,0.888],[-16.2,-3],[-14.436,-7.308]],"c":true},"ix":2},"nm":"Path 7","mn":"ADBE Vector Shape - Group","hd":false},{"ind":7,"ty":"sh","ix":8,"ks":{"a":0,"k":{"i":[[-1.144,0],[-0.616,1.048],[0,1.872],[0.624,1.04],[1.16,0],[0.624,-1.048],[0,-1.864],[-0.616,-1.056]],"o":[[1.16,0],[0.624,-1.048],[0,-1.864],[-0.616,-1.048],[-1.144,0],[-0.616,1.04],[0,1.864],[0.624,1.048]],"v":[[-24.739,5.856],[-22.075,4.284],[-21.139,-0.096],[-22.075,-4.452],[-24.739,-6.024],[-27.391,-4.452],[-28.314,-0.096],[-27.391,4.284]],"c":true},"ix":2},"nm":"Path 8","mn":"ADBE Vector Shape - Group","hd":false},{"ind":8,"ty":"sh","ix":9,"ks":{"a":0,"k":{"i":[[2.088,0],[1.232,1.656],[0,2.688],[-1.224,1.648],[-2.072,0],[-1.232,-1.656],[0,-2.68],[1.24,-1.656]],"o":[[-2.072,0],[-1.224,-1.656],[0,-2.68],[1.232,-1.656],[2.088,0],[1.24,1.648],[0,2.688],[-1.232,1.656]],"v":[[-24.751,8.904],[-29.706,6.42],[-31.542,-0.096],[-29.706,-6.588],[-24.751,-9.072],[-19.771,-6.588],[-17.911,-0.096],[-19.771,6.42]],"c":true},"ix":2},"nm":"Path 9","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0.435294147566,0.282352941176,0.427451010311,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[56.996,34.304],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":11,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-5.28,0],[0,0],[0,-5.28],[0,0],[5.28,0],[0,0],[0,5.28],[0,0]],"o":[[0,0],[5.28,0],[0,0],[0,5.28],[0,0],[-5.28,0],[0,0],[0,-5.28]],"v":[[-141.601,-95.138],[141.601,-95.138],[151.161,-85.578],[151.161,85.578],[141.601,95.138],[-141.601,95.138],[-151.161,85.578],[-151.161,-85.578]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.603921568627,0.552941176471,0.58431372549,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":4.482,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[155.643,99.62],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 4","np":2,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-149.599,-94.689],[149.599,-94.689],[149.599,94.689],[-149.599,94.689]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.996078491211,0.964705942191,0.972549079446,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[155.201,99.171],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 5","np":2,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"ct":1,"bm":0}],"markers":[],"props":{}}
\ No newline at end of file
diff --git a/res/raw-sw600dp/lottie_lock_screen_notification_minimalism_full_list.json b/res/raw-sw600dp/lottie_lock_screen_notification_minimalism_full_list.json
new file mode 100644
index 0000000..94017ba
--- /dev/null
+++ b/res/raw-sw600dp/lottie_lock_screen_notification_minimalism_full_list.json
@@ -0,0 +1 @@
+{"v":"5.12.1","fr":60,"ip":0,"op":180,"w":380,"h":277,"nm":"Dark_B1","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Dark_B1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[190.643,138.62,0],"ix":2,"l":2},"a":{"a":0,"k":[155.643,99.62,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-4.951,0],[0,0],[0,-4.951],[0,0],[4.951,0],[0,0],[0,4.951],[0,0]],"o":[[0,0],[4.951,0],[0,0],[0,4.951],[0,0],[-4.951,0],[0,0],[0,-4.951]],"v":[[-56.59,-15.688],[56.591,-15.688],[65.555,-6.723],[65.555,6.724],[56.591,15.688],[-56.59,15.688],[-65.555,6.724],[-65.555,-6.723]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.819607902976,0.725490196078,0.796078491211,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[224.554,88.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-9.283,0],[0,0],[0,-9.283],[0,0],[9.284,0],[0,0],[0,9.283],[0,0]],"o":[[0,0],[9.284,0],[0,0],[0,9.283],[0,0],[-9.283,0],[0,0],[0,-9.283]],"v":[[-48.691,-21.5],[48.691,-21.5],[65.5,-4.691],[65.5,4.691],[48.691,21.5],[-48.691,21.5],[-65.5,4.691],[-65.5,-4.691]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.819607902976,0.725490196078,0.796078491211,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[224.5,46.312],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-5.247,0],[0,0],[0,-5.247],[5.247,0],[0,0],[0,5.247]],"o":[[0,0],[5.247,0],[0,5.247],[0,0],[-5.247,0],[0,-5.247]],"v":[[-14,-9.5],[14,-9.5],[23.5,0],[14,9.5],[-14,9.5],[-23.5,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.819607902976,0.725490196078,0.796078491211,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[182.5,121.312],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.144,0],[-0.616,1.048],[0,1.872],[0.624,1.04],[1.16,0],[0.624,-1.048],[0,-1.864],[-0.616,-1.056]],"o":[[1.16,0],[0.624,-1.048],[0,-1.864],[-0.616,-1.048],[-1.144,0],[-0.616,1.04],[0,1.864],[0.624,1.048]],"v":[[24.715,5.856],[27.379,4.284],[28.314,-0.096],[27.379,-4.452],[24.715,-6.024],[22.062,-4.452],[21.139,-0.096],[22.062,4.284]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[2.088,0],[1.232,1.656],[0,2.688],[-1.224,1.648],[-2.072,0],[-1.232,-1.656],[0,-2.68],[1.24,-1.656]],"o":[[-2.072,0],[-1.224,-1.656],[0,-2.68],[1.232,-1.656],[2.088,0],[1.24,1.648],[0,2.688],[-1.232,1.656]],"v":[[24.702,8.904],[19.747,6.42],[17.911,-0.096],[19.747,-6.588],[24.702,-9.072],[29.683,-6.588],[31.543,-0.096],[29.683,6.42]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[1.768,0],[0.72,0.304],[0.52,0.56],[0.232,0.576],[0,0],[-0.92,0.352],[0,0],[-0.144,-0.352],[-0.272,-0.336],[-0.36,-0.184],[-0.488,0],[-0.504,0.512],[0,0.736],[0.552,0.464],[0.84,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-0.48,0.432],[0,0.72],[0.432,0.416],[0.736,0],[0.32,-0.144],[0.248,-0.264],[0.168,-0.304],[0,0],[0,0],[0,0],[-0.288,0.496],[-0.504,0.448],[-0.64,0.232],[-0.832,0],[-0.952,-0.832],[0,-1.352],[0.432,-0.672],[0.776,-0.288],[0,0],[-0.536,-0.752],[0,-1.056],[1.096,-0.992]],"o":[[-0.968,0],[-0.72,-0.304],[-0.52,-0.568],[-0.232,-0.584],[0,0],[0.92,-0.352],[0,0],[0.152,0.352],[0.28,0.328],[0.36,0.176],[0.808,0],[0.512,-0.52],[0,-0.824],[-0.552,-0.464],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0.76,0],[0.488,-0.432],[0,-0.672],[-0.432,-0.416],[-0.4,0],[-0.312,0.144],[-0.248,0.256],[-0.16,0.304],[0,0],[-0.832,-0.464],[0,0],[0.296,-0.496],[0.512,-0.448],[0.648,-0.24],[1.584,0],[0.96,0.832],[0,0.928],[-0.424,0.664],[0,0],[0.944,0.312],[0.536,0.752],[0,1.512],[-1.088,0.984]],"v":[[10.013,8.904],[7.48,8.448],[5.62,7.152],[4.493,5.436],[4.145,4.56],[5.525,4.032],[6.905,3.504],[7.12,4.032],[7.757,5.064],[8.717,5.832],[9.989,6.096],[11.956,5.328],[12.725,3.444],[11.896,1.512],[9.809,0.816],[9.281,0.816],[8.176,0.816],[8.176,-0.408],[8.176,-1.632],[9.281,-1.632],[9.641,-1.632],[11.501,-2.28],[12.232,-4.008],[11.585,-5.64],[9.833,-6.264],[8.753,-6.048],[7.913,-5.436],[7.288,-4.596],[7.049,-4.14],[5.788,-4.836],[4.541,-5.532],[4.973,-6.276],[6.173,-7.692],[7.901,-8.712],[10.12,-9.072],[13.924,-7.824],[15.365,-4.548],[14.717,-2.148],[12.917,-0.72],[12.917,-0.636],[15.137,0.96],[15.941,3.672],[14.297,7.428]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[0.576,0],[0.4,0.392],[0,0.576],[-0.4,0.392],[-0.576,0],[-0.392,-0.392],[0,-0.568],[0.4,-0.392]],"o":[[-0.576,0],[-0.4,-0.392],[0,-0.568],[0.4,-0.392],[0.576,0],[0.4,0.392],[0,0.576],[-0.392,0.392]],"v":[[0.289,6.24],[-1.174,5.652],[-1.775,4.2],[-1.174,2.76],[0.289,2.172],[1.742,2.76],[2.342,4.2],[1.742,5.652]],"c":true},"ix":2},"nm":"Path 4","mn":"ADBE Vector Shape - Group","hd":false},{"ind":4,"ty":"sh","ix":5,"ks":{"a":0,"k":{"i":[[0.576,0],[0.4,0.392],[0,0.576],[-0.392,0.392],[-0.576,0],[-0.392,-0.392],[0,-0.568],[0.4,-0.392]],"o":[[-0.576,0],[-0.392,-0.392],[0,-0.568],[0.4,-0.392],[0.576,0],[0.4,0.392],[0,0.576],[-0.392,0.392]],"v":[[0.29,-2.364],[-1.174,-2.952],[-1.762,-4.404],[-1.174,-5.844],[0.29,-6.432],[1.742,-5.844],[2.342,-4.404],[1.742,-2.952]],"c":true},"ix":2},"nm":"Path 5","mn":"ADBE Vector Shape - Group","hd":false},{"ind":5,"ty":"sh","ix":6,"ks":{"a":0,"k":{"i":[[0.888,0],[0.56,-0.568],[0,-0.88],[-0.56,-0.568],[-0.872,0],[-0.584,0.568],[0,0.864],[0.576,0.56]],"o":[[-0.888,0],[-0.56,0.56],[0,0.856],[0.568,0.568],[0.88,0],[0.584,-0.568],[0,-0.872],[-0.576,-0.568]],"v":[[-10.008,-6.132],[-12.18,-5.28],[-13.02,-3.12],[-12.18,-0.984],[-10.02,-0.132],[-7.824,-0.984],[-6.948,-3.132],[-7.812,-5.28]],"c":true},"ix":2},"nm":"Path 6","mn":"ADBE Vector Shape - Group","hd":false},{"ind":6,"ty":"sh","ix":7,"ks":{"a":0,"k":{"i":[[-1.792,0],[-1.152,-1.128],[0,-1.72],[0.6,-1.088],[0.88,-1.184],[0,0],[0,0],[0.816,0.56],[0,0],[-0.592,0.736],[0,0],[-0.848,0.664],[-0.472,2.496],[0,0],[1.344,-0.952],[1.624,0],[1.016,1.024],[0,1.568],[-1.176,1.152]],"o":[[1.824,0],[1.16,1.12],[0,1.184],[-0.592,1.088],[0,0],[-0.528,0.712],[0,0],[-0.904,-0.624],[0,0],[0,0],[0.416,-0.544],[0.856,-0.664],[0,0],[-0.232,1.752],[-1.336,0.944],[-1.488,0],[-1.016,-1.024],[0,-1.72],[1.184,-1.16]],"v":[[-9.972,-9.048],[-5.508,-7.356],[-3.768,-3.096],[-4.668,0.312],[-6.876,3.72],[-9.995,8.004],[-10.788,9.072],[-12.012,8.232],[-13.368,7.296],[-12.48,6.192],[-10.5,3.432],[-8.604,1.62],[-6.612,-3.12],[-4.116,-3.048],[-6.48,1.008],[-10.92,2.424],[-14.676,0.888],[-16.2,-3],[-14.436,-7.308]],"c":true},"ix":2},"nm":"Path 7","mn":"ADBE Vector Shape - Group","hd":false},{"ind":7,"ty":"sh","ix":8,"ks":{"a":0,"k":{"i":[[-1.144,0],[-0.616,1.048],[0,1.872],[0.624,1.04],[1.16,0],[0.624,-1.048],[0,-1.864],[-0.616,-1.056]],"o":[[1.16,0],[0.624,-1.048],[0,-1.864],[-0.616,-1.048],[-1.144,0],[-0.616,1.04],[0,1.864],[0.624,1.048]],"v":[[-24.739,5.856],[-22.075,4.284],[-21.139,-0.096],[-22.075,-4.452],[-24.739,-6.024],[-27.391,-4.452],[-28.314,-0.096],[-27.391,4.284]],"c":true},"ix":2},"nm":"Path 8","mn":"ADBE Vector Shape - Group","hd":false},{"ind":8,"ty":"sh","ix":9,"ks":{"a":0,"k":{"i":[[2.088,0],[1.232,1.656],[0,2.688],[-1.224,1.648],[-2.072,0],[-1.232,-1.656],[0,-2.68],[1.24,-1.656]],"o":[[-2.072,0],[-1.224,-1.656],[0,-2.68],[1.232,-1.656],[2.088,0],[1.24,1.648],[0,2.688],[-1.232,1.656]],"v":[[-24.751,8.904],[-29.706,6.42],[-31.542,-0.096],[-29.706,-6.588],[-24.751,-9.072],[-19.771,-6.588],[-17.911,-0.096],[-19.771,6.42]],"c":true},"ix":2},"nm":"Path 9","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0.435294147566,0.282352941176,0.427451010311,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[53.996,34.492],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 4","np":11,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-5.28,0],[0,0],[0,-5.28],[0,0],[5.28,0],[0,0],[0,5.28],[0,0]],"o":[[0,0],[5.28,0],[0,0],[0,5.28],[0,0],[-5.28,0],[0,0],[0,-5.28]],"v":[[-141.601,-95.138],[141.601,-95.138],[151.161,-85.578],[151.161,85.578],[141.601,95.138],[-141.601,95.138],[-151.161,85.578],[-151.161,-85.578]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.603921568627,0.552941176471,0.58431372549,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":4.482,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[155.643,99.62],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 5","np":2,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-149.599,-94.689],[149.599,-94.689],[149.599,94.689],[-149.599,94.689]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.996078491211,0.964705942191,0.972549079446,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[155.201,99.171],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 6","np":2,"cix":2,"bm":0,"ix":6,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"ct":1,"bm":0}],"markers":[],"props":{}}
\ No newline at end of file
diff --git a/res/raw/lottie_lock_screen_notification_minimalism_compact_view.json b/res/raw/lottie_lock_screen_notification_minimalism_compact_view.json
new file mode 100644
index 0000000..9dcd80d
--- /dev/null
+++ b/res/raw/lottie_lock_screen_notification_minimalism_compact_view.json
@@ -0,0 +1 @@
+{"v":"5.12.1","fr":60,"ip":0,"op":180,"w":380,"h":277,"nm":"Light_A1","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Light_A1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[190.5,173.312,0],"ix":2,"l":2},"a":{"a":0,"k":[78.75,145.562,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.242,0],[-0.677,1.138],[0,2.032],[0.678,1.129],[1.251,0],[0.678,-1.138],[0,-2.024],[-0.668,-1.146]],"o":[[1.251,0],[0.678,-1.138],[0,-2.024],[-0.677,-1.138],[-1.242,0],[-0.668,1.129],[0,2.023],[0.678,1.138]],"v":[[26.841,6.365],[29.733,4.658],[30.75,-0.098],[29.733,-4.827],[26.841,-6.535],[23.961,-4.827],[22.958,-0.098],[23.961,4.658]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[2.267,0],[1.337,1.798],[0,2.918],[-1.329,1.789],[-2.25,0],[-1.338,-1.798],[0,-2.91],[1.338,-1.806]],"o":[[-2.25,0],[-1.329,-1.798],[0,-2.91],[1.337,-1.798],[2.267,0],[1.338,1.789],[0,2.909],[-1.338,1.798]],"v":[[26.828,9.674],[21.447,6.977],[19.453,-0.098],[21.447,-7.146],[26.828,-9.844],[32.235,-7.146],[34.242,-0.098],[32.235,6.977]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[1.92,0],[0.782,0.33],[0.565,0.608],[0.251,0.625],[0,0],[-0.999,0.382],[0,0],[-0.156,-0.383],[-0.296,-0.365],[-0.391,-0.2],[-0.53,0],[-0.547,0.556],[0,0.799],[0.599,0.504],[0.912,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-0.521,0.469],[0,0.782],[0.478,0.452],[0.799,0],[0.347,-0.156],[0.269,-0.286],[0.183,-0.331],[0,0],[0.912,0.495],[0,0],[-0.313,0.539],[-0.548,0.486],[-0.695,0.261],[-0.912,0],[-1.034,-0.904],[0,-1.468],[0.469,-0.73],[0.843,-0.313],[0,0],[-0.582,-0.825],[0,-1.147],[1.19,-1.077]],"o":[[-1.051,0],[-0.782,-0.338],[-0.564,-0.608],[-0.252,-0.634],[0,0],[0.999,-0.383],[0,0],[0.165,0.382],[0.304,0.356],[0.391,0.191],[0.877,0],[0.556,-0.565],[0,-0.895],[-0.6,-0.503],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0.834,0],[0.53,-0.469],[0,-0.73],[-0.469,-0.452],[-0.435,0],[-0.339,0.156],[-0.269,0.287],[-0.173,0.321],[0,0],[-0.904,-0.504],[0,0],[0.321,-0.538],[0.547,-0.487],[0.703,-0.26],[1.72,0],[1.042,0.903],[0,1.007],[-0.461,0.72],[0,0],[1.025,0.33],[0.582,0.817],[0,1.641],[-1.182,1.068]],"v":[[10.852,9.674],[8.103,9.178],[6.083,7.758],[4.859,5.909],[4.481,4.958],[5.979,4.385],[7.477,3.811],[7.712,4.385],[8.403,5.505],[9.445,6.339],[10.826,6.626],[12.963,5.792],[13.797,3.745],[12.898,1.648],[10.631,0.893],[10.044,0.893],[8.859,0.893],[8.859,-0.436],[8.859,-1.766],[10.044,-1.766],[10.448,-1.766],[12.481,-2.469],[13.276,-4.346],[12.559,-6.117],[10.657,-6.796],[9.484,-6.561],[8.572,-5.896],[7.894,-4.971],[7.634,-4.488],[6.266,-5.231],[4.911,-5.988],[5.38,-6.796],[6.683,-8.333],[8.546,-9.453],[10.969,-9.844],[15.1,-8.488],[16.663,-4.932],[15.96,-2.326],[14.005,-0.775],[14.005,-0.684],[16.416,1.049],[17.289,3.993],[15.504,8.072]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[0.634,0],[0.435,0.425],[0,0.625],[-0.425,0.426],[-0.625,0],[-0.426,-0.425],[0,-0.617],[0.434,-0.426]],"o":[[-0.625,0],[-0.425,-0.426],[0,-0.617],[0.435,-0.425],[0.634,0],[0.434,0.426],[0,0.625],[-0.426,0.425]],"v":[[0.282,6.782],[-1.308,6.144],[-1.946,4.566],[-1.308,3.003],[0.282,2.365],[1.872,3.003],[2.523,4.566],[1.872,6.144]],"c":true},"ix":2},"nm":"Path 4","mn":"ADBE Vector Shape - Group","hd":false},{"ind":4,"ty":"sh","ix":5,"ks":{"a":0,"k":{"i":[[0.634,0],[0.435,0.425],[0,0.625],[-0.425,0.426],[-0.625,0],[-0.426,-0.425],[0,-0.617],[0.434,-0.426]],"o":[[-0.625,0],[-0.425,-0.426],[0,-0.617],[0.435,-0.425],[0.634,0],[0.434,0.426],[0,0.625],[-0.426,0.425]],"v":[[0.282,-2.561],[-1.308,-3.199],[-1.946,-4.775],[-1.308,-6.339],[0.282,-6.977],[1.872,-6.339],[2.523,-4.775],[1.872,-3.199]],"c":true},"ix":2},"nm":"Path 5","mn":"ADBE Vector Shape - Group","hd":false},{"ind":5,"ty":"sh","ix":6,"ks":{"a":0,"k":{"i":[[0.973,0],[0.616,-0.617],[0,-0.955],[-0.617,-0.616],[-0.947,0],[-0.634,0.617],[0,0.938],[0.625,0.608]],"o":[[-0.964,0],[-0.608,0.608],[0,0.93],[0.617,0.617],[0.964,0],[0.635,-0.616],[0,-0.947],[-0.626,-0.617]],"v":[[-10.885,-6.652],[-13.256,-5.727],[-14.168,-3.382],[-13.243,-1.062],[-10.898,-0.137],[-8.501,-1.062],[-7.549,-3.395],[-8.487,-5.727]],"c":true},"ix":2},"nm":"Path 6","mn":"ADBE Vector Shape - Group","hd":false},{"ind":6,"ty":"sh","ix":7,"ks":{"a":0,"k":{"i":[[-1.946,0],[-1.251,-1.225],[0,-1.876],[0.643,-1.181],[0.955,-1.294],[0,0],[0,0],[0.886,0.599],[0,0],[-0.643,0.808],[0,0],[-0.93,0.721],[-0.512,2.702],[0,0],[1.459,-1.033],[1.754,0],[1.103,1.112],[0,1.703],[-1.277,1.251]],"o":[[1.989,0],[1.251,1.216],[0,1.277],[-0.643,1.173],[0,0],[-0.573,0.765],[0,0],[-0.981,-0.678],[0,0],[0,0],[0.452,-0.591],[0.929,-0.721],[0,0],[-0.26,1.902],[-1.451,1.025],[-1.616,0],[-1.103,-1.112],[0,-1.867],[1.286,-1.26]],"v":[[-10.846,-9.818],[-5.986,-7.98],[-4.11,-3.342],[-5.074,0.344],[-7.471,4.046],[-10.872,8.697],[-11.732,9.844],[-13.061,8.945],[-14.533,7.928],[-13.569,6.717],[-11.419,3.732],[-9.347,1.766],[-7.185,-3.368],[-4.488,-3.303],[-7.067,1.1],[-11.875,2.639],[-15.953,0.971],[-17.608,-3.251],[-15.693,-7.928]],"c":true},"ix":2},"nm":"Path 7","mn":"ADBE Vector Shape - Group","hd":false},{"ind":7,"ty":"sh","ix":8,"ks":{"a":0,"k":{"i":[[-1.242,0],[-0.677,1.138],[0,2.032],[0.678,1.129],[1.251,0],[0.678,-1.138],[0,-2.024],[-0.668,-1.146]],"o":[[1.251,0],[0.678,-1.138],[0,-2.024],[-0.677,-1.138],[-1.242,0],[-0.668,1.129],[0,2.023],[0.678,1.138]],"v":[[-26.854,6.365],[-23.962,4.658],[-22.945,-0.098],[-23.962,-4.827],[-26.854,-6.535],[-29.734,-4.827],[-30.737,-0.098],[-29.734,4.658]],"c":true},"ix":2},"nm":"Path 8","mn":"ADBE Vector Shape - Group","hd":false},{"ind":8,"ty":"sh","ix":9,"ks":{"a":0,"k":{"i":[[2.267,0],[1.337,1.798],[0,2.918],[-1.329,1.789],[-2.25,0],[-1.338,-1.798],[0,-2.91],[1.338,-1.806]],"o":[[-2.25,0],[-1.329,-1.798],[0,-2.91],[1.337,-1.798],[2.267,0],[1.338,1.789],[0,2.909],[-1.338,1.798]],"v":[[-26.867,9.674],[-32.248,6.977],[-34.242,-0.098],[-32.248,-7.146],[-26.867,-9.844],[-21.46,-7.146],[-19.453,-0.098],[-21.46,6.977]],"c":true},"ix":2},"nm":"Path 9","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0.435294147566,0.282352941176,0.427451010311,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[52.574,47.013],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":11,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-6.627,0],[0,0],[0,-6.627],[0,0],[6.627,0],[0,0],[0,6.627],[0,0]],"o":[[0,0],[6.627,0],[0,0],[0,6.627],[0,0],[-6.627,0],[0,0],[0,-6.627]],"v":[[-49.5,-15.5],[49.5,-15.5],[61.5,-3.5],[61.5,3.5],[49.5,15.5],[-49.5,15.5],[-61.5,3.5],[-61.5,-3.5]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.819607902976,0.725490196078,0.796078491211,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[78.75,83.75],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-3.406,0],[0,0],[0,-3.407],[3.407,0],[0,0],[0,3.406]],"o":[[0,0],[3.407,0],[0,3.406],[0,0],[-3.406,0],[0,-3.407]],"v":[[-14.579,-6.168],[14.578,-6.168],[20.747,0],[14.578,6.168],[-14.579,6.168],[-20.747,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.819607902976,0.725490196078,0.796078491211,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[37.996,110.418],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[5.101,0],[0,0],[0,5.13],[0,0],[-5.101,0],[0,0],[0,-5.13]],"o":[[0,5.145],[0,0],[-5.101,0],[0,0],[0,-5.145],[0,0],[5.101,0],[0,0]],"v":[[70.135,151.084],[60.793,160.47],[-63.518,160.47],[-72.86,151.084],[-72.86,-109.46],[-63.518,-118.846],[60.793,-118.846],[70.135,-109.46]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,1.676],[0,0],[1.589,0.612],[0,0],[8.307,0],[0,0],[0,-8.336],[0,0],[-8.307,0],[0,0],[0,8.336],[0,0],[0,1.778],[0,0],[1.588,0.613]],"o":[[0,0],[1.603,-0.568],[0,0],[0,-1.778],[0,0],[0,-8.336],[0,0],[-8.307,0],[0,0],[0,8.336],[0,0],[8.307,0],[0,0],[1.588,-0.598],[0,0],[0,-1.778],[0,0]],"v":[[75.775,-15.767],[75.775,-35.019],[78.383,-38.895],[78.383,-49.738],[75.658,-53.673],[75.658,-109.46],[60.677,-124.5],[-63.518,-124.5],[-78.5,-109.46],[-78.5,151.084],[-63.518,166.124],[60.793,166.124],[75.775,151.084],[75.775,19.253],[78.5,15.318],[78.5,-11.862],[75.775,-15.797]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0.603921568627,0.552941176471,0.58431372549,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[78.75,124.75],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 4","np":6,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[2.468,0],[0,2.47],[-2.469,0],[0,-2.47]],"o":[[-2.469,0],[0,-2.47],[2.468,0],[0,2.47]],"v":[[0.001,-106.453],[-4.462,-110.916],[0.001,-115.379],[4.462,-110.916]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[6.573,0],[0,0],[0,-6.576],[0,0],[-6.573,0],[0,0],[0,6.575],[0,0]],"o":[[0,0],[-6.573,0],[0,0],[0,6.575],[0,0],[6.573,0],[0,0],[0,-6.576]],"v":[[60.97,-122.818],[-60.971,-122.818],[-72.868,-110.916],[-72.868,150.921],[-60.971,162.822],[60.97,162.822],[72.868,150.921],[72.868,-110.916]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0.945098099054,0.894117706897,0.913725550034,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[78.725,126.432],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 5","np":6,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"ct":1,"bm":0}],"markers":[],"props":{}}
\ No newline at end of file
diff --git a/res/raw/lottie_lock_screen_notification_minimalism_full_list.json b/res/raw/lottie_lock_screen_notification_minimalism_full_list.json
new file mode 100644
index 0000000..142cc44
--- /dev/null
+++ b/res/raw/lottie_lock_screen_notification_minimalism_full_list.json
@@ -0,0 +1 @@
+{"v":"5.12.1","fr":60,"ip":0,"op":180,"w":380,"h":277,"nm":"Light_A2","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Light_A2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[190.5,173.32,0],"ix":2,"l":2},"a":{"a":0,"k":[78.75,145.57,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.242,0],[-0.677,1.138],[0,2.032],[0.678,1.129],[1.251,0],[0.678,-1.138],[0,-2.024],[-0.668,-1.146]],"o":[[1.251,0],[0.678,-1.138],[0,-2.024],[-0.677,-1.138],[-1.242,0],[-0.668,1.129],[0,2.023],[0.678,1.138]],"v":[[26.841,6.365],[29.733,4.658],[30.75,-0.098],[29.733,-4.827],[26.841,-6.535],[23.961,-4.827],[22.958,-0.098],[23.961,4.658]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[2.267,0],[1.337,1.798],[0,2.918],[-1.329,1.789],[-2.25,0],[-1.338,-1.798],[0,-2.91],[1.338,-1.806]],"o":[[-2.25,0],[-1.329,-1.798],[0,-2.91],[1.337,-1.798],[2.267,0],[1.338,1.789],[0,2.909],[-1.338,1.798]],"v":[[26.828,9.674],[21.447,6.977],[19.453,-0.098],[21.447,-7.146],[26.828,-9.844],[32.235,-7.146],[34.242,-0.098],[32.235,6.977]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[1.92,0],[0.782,0.33],[0.565,0.608],[0.251,0.625],[0,0],[-0.999,0.382],[0,0],[-0.156,-0.383],[-0.296,-0.365],[-0.391,-0.2],[-0.53,0],[-0.547,0.556],[0,0.799],[0.599,0.504],[0.912,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-0.521,0.469],[0,0.782],[0.478,0.452],[0.799,0],[0.347,-0.156],[0.269,-0.286],[0.183,-0.331],[0,0],[0.912,0.495],[0,0],[-0.313,0.539],[-0.548,0.486],[-0.695,0.261],[-0.912,0],[-1.034,-0.904],[0,-1.468],[0.469,-0.73],[0.843,-0.313],[0,0],[-0.582,-0.825],[0,-1.147],[1.19,-1.077]],"o":[[-1.051,0],[-0.782,-0.338],[-0.564,-0.608],[-0.252,-0.634],[0,0],[0.999,-0.383],[0,0],[0.165,0.382],[0.304,0.356],[0.391,0.191],[0.877,0],[0.556,-0.565],[0,-0.895],[-0.6,-0.503],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0.834,0],[0.53,-0.469],[0,-0.73],[-0.469,-0.452],[-0.435,0],[-0.339,0.156],[-0.269,0.287],[-0.173,0.321],[0,0],[-0.904,-0.504],[0,0],[0.321,-0.538],[0.547,-0.487],[0.703,-0.26],[1.72,0],[1.042,0.903],[0,1.007],[-0.461,0.72],[0,0],[1.025,0.33],[0.582,0.817],[0,1.641],[-1.182,1.068]],"v":[[10.852,9.674],[8.103,9.178],[6.083,7.758],[4.859,5.909],[4.481,4.958],[5.979,4.385],[7.477,3.811],[7.712,4.385],[8.403,5.505],[9.445,6.339],[10.826,6.626],[12.963,5.792],[13.797,3.745],[12.898,1.648],[10.631,0.893],[10.044,0.893],[8.859,0.893],[8.859,-0.436],[8.859,-1.766],[10.044,-1.766],[10.448,-1.766],[12.481,-2.469],[13.276,-4.346],[12.559,-6.117],[10.657,-6.796],[9.484,-6.561],[8.572,-5.896],[7.894,-4.971],[7.634,-4.488],[6.266,-5.231],[4.911,-5.988],[5.38,-6.796],[6.683,-8.333],[8.546,-9.453],[10.969,-9.844],[15.1,-8.488],[16.663,-4.932],[15.96,-2.326],[14.005,-0.775],[14.005,-0.684],[16.416,1.049],[17.289,3.993],[15.504,8.072]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[0.634,0],[0.435,0.425],[0,0.625],[-0.425,0.426],[-0.625,0],[-0.426,-0.425],[0,-0.617],[0.434,-0.426]],"o":[[-0.625,0],[-0.425,-0.426],[0,-0.617],[0.435,-0.425],[0.634,0],[0.434,0.426],[0,0.625],[-0.426,0.425]],"v":[[0.282,6.782],[-1.308,6.144],[-1.946,4.566],[-1.308,3.003],[0.282,2.365],[1.872,3.003],[2.523,4.566],[1.872,6.144]],"c":true},"ix":2},"nm":"Path 4","mn":"ADBE Vector Shape - Group","hd":false},{"ind":4,"ty":"sh","ix":5,"ks":{"a":0,"k":{"i":[[0.634,0],[0.435,0.425],[0,0.625],[-0.425,0.426],[-0.625,0],[-0.426,-0.425],[0,-0.617],[0.434,-0.426]],"o":[[-0.625,0],[-0.425,-0.426],[0,-0.617],[0.435,-0.425],[0.634,0],[0.434,0.426],[0,0.625],[-0.426,0.425]],"v":[[0.282,-2.561],[-1.308,-3.199],[-1.946,-4.775],[-1.308,-6.339],[0.282,-6.977],[1.872,-6.339],[2.523,-4.775],[1.872,-3.199]],"c":true},"ix":2},"nm":"Path 5","mn":"ADBE Vector Shape - Group","hd":false},{"ind":5,"ty":"sh","ix":6,"ks":{"a":0,"k":{"i":[[0.973,0],[0.616,-0.617],[0,-0.955],[-0.617,-0.616],[-0.947,0],[-0.634,0.617],[0,0.938],[0.625,0.608]],"o":[[-0.964,0],[-0.608,0.608],[0,0.93],[0.617,0.617],[0.964,0],[0.635,-0.616],[0,-0.947],[-0.626,-0.617]],"v":[[-10.885,-6.652],[-13.256,-5.727],[-14.168,-3.382],[-13.243,-1.062],[-10.898,-0.137],[-8.501,-1.062],[-7.549,-3.395],[-8.487,-5.727]],"c":true},"ix":2},"nm":"Path 6","mn":"ADBE Vector Shape - Group","hd":false},{"ind":6,"ty":"sh","ix":7,"ks":{"a":0,"k":{"i":[[-1.946,0],[-1.251,-1.225],[0,-1.876],[0.643,-1.181],[0.955,-1.294],[0,0],[0,0],[0.886,0.599],[0,0],[-0.643,0.808],[0,0],[-0.93,0.721],[-0.512,2.702],[0,0],[1.459,-1.033],[1.754,0],[1.103,1.112],[0,1.703],[-1.277,1.251]],"o":[[1.989,0],[1.251,1.216],[0,1.277],[-0.643,1.173],[0,0],[-0.573,0.765],[0,0],[-0.981,-0.678],[0,0],[0,0],[0.452,-0.591],[0.929,-0.721],[0,0],[-0.26,1.902],[-1.451,1.025],[-1.616,0],[-1.103,-1.112],[0,-1.867],[1.286,-1.26]],"v":[[-10.846,-9.818],[-5.986,-7.98],[-4.11,-3.342],[-5.074,0.344],[-7.471,4.046],[-10.872,8.697],[-11.732,9.844],[-13.061,8.945],[-14.533,7.928],[-13.569,6.717],[-11.419,3.732],[-9.347,1.766],[-7.185,-3.368],[-4.488,-3.303],[-7.067,1.1],[-11.875,2.639],[-15.953,0.971],[-17.608,-3.251],[-15.693,-7.928]],"c":true},"ix":2},"nm":"Path 7","mn":"ADBE Vector Shape - Group","hd":false},{"ind":7,"ty":"sh","ix":8,"ks":{"a":0,"k":{"i":[[-1.242,0],[-0.677,1.138],[0,2.032],[0.678,1.129],[1.251,0],[0.678,-1.138],[0,-2.024],[-0.668,-1.146]],"o":[[1.251,0],[0.678,-1.138],[0,-2.024],[-0.677,-1.138],[-1.242,0],[-0.668,1.129],[0,2.023],[0.678,1.138]],"v":[[-26.854,6.365],[-23.962,4.658],[-22.945,-0.098],[-23.962,-4.827],[-26.854,-6.535],[-29.734,-4.827],[-30.737,-0.098],[-29.734,4.658]],"c":true},"ix":2},"nm":"Path 8","mn":"ADBE Vector Shape - Group","hd":false},{"ind":8,"ty":"sh","ix":9,"ks":{"a":0,"k":{"i":[[2.267,0],[1.337,1.798],[0,2.918],[-1.329,1.789],[-2.25,0],[-1.338,-1.798],[0,-2.91],[1.338,-1.806]],"o":[[-2.25,0],[-1.329,-1.798],[0,-2.91],[1.337,-1.798],[2.267,0],[1.338,1.789],[0,2.909],[-1.338,1.798]],"v":[[-26.867,9.674],[-32.248,6.977],[-34.242,-0.098],[-32.248,-7.146],[-26.867,-9.844],[-21.46,-7.146],[-19.453,-0.098],[-21.46,6.977]],"c":true},"ix":2},"nm":"Path 9","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0.435294147566,0.282352941176,0.427451010311,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[52.574,47.013],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":11,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-6.627,0],[0,0],[0,-6.627],[0,0],[6.627,0],[0,0],[0,6.627],[0,0]],"o":[[0,0],[6.627,0],[0,0],[0,6.627],[0,0],[-6.627,0],[0,0],[0,-6.627]],"v":[[-44.072,-15.7],[44.072,-15.7],[56.072,-3.7],[56.072,3.7],[44.072,15.7],[-44.072,15.7],[-56.072,3.7],[-56.072,-3.7]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.819607902976,0.725490196078,0.796078491211,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[73.142,85.728],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-4.955,0],[0,0],[0,-4.954],[0,0],[4.955,0],[0,0],[0,4.954],[0,0]],"o":[[0,0],[4.955,0],[0,0],[0,4.954],[0,0],[-4.955,0],[0,0],[0,-4.954]],"v":[[-47.101,-15.7],[47.1,-15.7],[56.072,-6.729],[56.072,6.729],[47.1,15.7],[-47.101,15.7],[-56.072,6.729],[-56.072,-6.729]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.819607902976,0.725490196078,0.796078491211,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[73.143,123.128],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-4.955,0],[0,0],[0,-4.954],[0,0],[4.955,0],[0,0],[0,4.954],[0,0]],"o":[[0,0],[4.955,0],[0,0],[0,4.954],[0,0],[-4.955,0],[0,0],[0,-4.954]],"v":[[-47.101,-15.7],[47.1,-15.7],[56.072,-6.729],[56.072,6.729],[47.1,15.7],[-47.101,15.7],[-56.072,6.729],[-56.072,-6.729]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.819607902976,0.725490196078,0.796078491211,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[73.143,160.528],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 4","np":2,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-3.406,0],[0,0],[0,-3.407],[3.407,0],[0,0],[0,3.406]],"o":[[0,0],[3.407,0],[0,3.406],[0,0],[-3.406,0],[0,-3.407]],"v":[[-14.579,-6.168],[14.578,-6.168],[20.747,0],[14.578,6.168],[-14.579,6.168],[-20.747,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.819607902976,0.725490196078,0.796078491211,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[37.817,188.418],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 5","np":2,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[5.101,0],[0,0],[0,5.13],[0,0],[-5.101,0],[0,0],[0,-5.13]],"o":[[0,5.145],[0,0],[-5.101,0],[0,0],[0,-5.145],[0,0],[5.101,0],[0,0]],"v":[[70.135,151.084],[60.793,160.47],[-63.518,160.47],[-72.86,151.084],[-72.86,-109.46],[-63.518,-118.846],[60.793,-118.846],[70.135,-109.46]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,1.676],[0,0],[1.589,0.612],[0,0],[8.307,0],[0,0],[0,-8.336],[0,0],[-8.307,0],[0,0],[0,8.336],[0,0],[0,1.778],[0,0],[1.588,0.613]],"o":[[0,0],[1.603,-0.568],[0,0],[0,-1.778],[0,0],[0,-8.336],[0,0],[-8.307,0],[0,0],[0,8.336],[0,0],[8.307,0],[0,0],[1.588,-0.598],[0,0],[0,-1.778],[0,0]],"v":[[75.775,-15.767],[75.775,-35.019],[78.383,-38.895],[78.383,-49.738],[75.658,-53.673],[75.658,-109.46],[60.677,-124.5],[-63.518,-124.5],[-78.5,-109.46],[-78.5,151.084],[-63.518,166.124],[60.793,166.124],[75.775,151.084],[75.775,19.253],[78.5,15.318],[78.5,-11.862],[75.775,-15.797]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0.603921568627,0.552941176471,0.58431372549,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[78.75,124.75],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 6","np":6,"cix":2,"bm":0,"ix":6,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[2.469,0],[0,2.47],[-2.468,0],[0,-2.47]],"o":[[-2.468,0],[0,-2.47],[2.469,0],[0,2.47]],"v":[[0,-105.635],[-4.461,-110.098],[0,-114.561],[4.462,-110.098]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[6.573,0],[0,0],[0,-6.576],[0,0],[-6.573,0],[0,0],[0,6.576],[0,0]],"o":[[0,0],[-6.573,0],[0,0],[0,6.576],[0,0],[6.573,0],[0,0],[0,-6.576]],"v":[[60.971,-122],[-60.97,-122],[-72.867,-110.098],[-72.867,151.738],[-60.97,163.64],[60.971,163.64],[72.868,151.738],[72.868,-110.098]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0.945098099054,0.894117706897,0.913725550034,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[78.117,127.25],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 7","np":6,"cix":2,"bm":0,"ix":7,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"ct":1,"bm":0}],"markers":[],"props":{}}
\ No newline at end of file
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 63c2692..3884c56 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Daar was ’n fout met die stel van die verstekrekening"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Geen verstek gestel nie"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Net toestel"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Toestel en %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Voeg ’n rekening by om te begin"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Waar om kontakte te stoor"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Omkring en Soek"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index b46d42b..8ba9884 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"ነባሪ መለያውን በማቀናበር ላይ ስህተት"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"ምንም ነባሪ አልተቀናበረም"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"መሣሪያ ብቻ"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"መሣሪያ እና %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"ለመጀመር መለያ ያክሉ"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"ዕውቂያዎች የት እንደሚቀመጡ"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"ለመፈለግ ክበብ"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index a888637..b70a586 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -45,7 +45,7 @@
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"تصغير"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"تكبير"</string>
     <string name="stay_awake_on_fold_title" msgid="6590454679898134221">"دائمًا"</string>
-    <string name="stay_awake_on_fold_summary" msgid="1939963751585954262">"يتم تشغيل الشاشة الأمامية عند طيّ الجهاز."</string>
+    <string name="stay_awake_on_fold_summary" msgid="1939963751585954262">"يتم تشغيل الشاشة الأمامية عند طيّ الجهاز"</string>
     <string name="selective_stay_awake_title" msgid="7887645333447645168">"الألعاب والفيديوهات فقط وغير ذلك"</string>
     <string name="selective_stay_awake_summary" msgid="9055967322921984543">"يتم تشغيل الشاشة الأمامية للتطبيقات التي تمنع انتقال الشاشة إلى \"وضع عدم النشاط\"."</string>
     <string name="stay_awake_on_lockscreen_title" msgid="8088456642083051068">"التمرير سريعًا للأعلى لمواصلة استخدام التطبيق"</string>
@@ -1789,7 +1789,7 @@
     <string name="lockpassword_confirm_your_password_header_frp" msgid="7932240547542564033">"التحقق من كلمة المرور"</string>
     <string name="lockpassword_remote_validation_header" msgid="4992647285784962073">"إثبات هويتك"</string>
     <string name="lockpassword_remote_validation_pattern_details" msgid="4655537780358707983">"‏لنقل حسابات Google والإعدادات وغير ذلك، أدخِل نقش جهازك الآخر. النقش مشفَّر."</string>
-    <string name="lockpassword_remote_validation_pin_details" msgid="2373654227583206297">"‏لنقل حسابات Google والإعدادات وغير ذلك، أدخِل رقم التعريف الشخصي لجهازك الآخر. رقم التعريف الشخصي مشفر."</string>
+    <string name="lockpassword_remote_validation_pin_details" msgid="2373654227583206297">"‏لنقل حسابات Google والإعدادات وغير ذلك، يُرجى إدخال رقم التعريف الشخصي لجهازك الآخر. رقم التعريف الشخصي مشفر."</string>
     <string name="lockpassword_remote_validation_password_details" msgid="3482328925925888340">"‏لنقل حسابات Google والإعدادات وغير ذلك، أدخِل كلمة مرور جهازك الآخر. كلمة المرور مشفَّرة."</string>
     <string name="lockpassword_remote_validation_set_pattern_as_screenlock" msgid="7595104317648465901">"استخدام نقش أيضًا لفتح هذا الجهاز"</string>
     <string name="lockpassword_remote_validation_set_pin_as_screenlock" msgid="509672303005547218">"إضافة رقم تعريف شخصي أيضًا لفتح هذا الجهاز"</string>
@@ -1811,8 +1811,8 @@
     <string name="lockpattern_recording_intro_footer" msgid="2656868858594487197">"اضغط على \"القائمة\" للمساعدة."</string>
     <string name="lockpattern_recording_inprogress" msgid="7268008332694009191">"ارفع إصبعك عن الشاشة عند الانتهاء."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3351522018450593723">"يجب ربط <xliff:g id="NUMBER">%d</xliff:g> نقاط على الأقل. يُرجى إعادة المحاولة."</string>
-    <string name="lockpattern_pattern_entered_header" msgid="7709618312713127249">"تم حفظ النقش."</string>
-    <string name="lockpattern_need_to_confirm" msgid="6489499109451714360">"ارسم النقش مرة أخرى للتأكيد."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="7709618312713127249">"تم حفظ النقش"</string>
+    <string name="lockpattern_need_to_confirm" msgid="6489499109451714360">"يجب رسم النقش مجددًا لتأكيده"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2969990617475456153">"النقش الجديد لفتح القفل"</string>
     <string name="lockpattern_confirm_button_text" msgid="6122815520373044089">"تأكيد"</string>
     <string name="lockpattern_restart_button_text" msgid="255339375151895998">"إعادة الرسم"</string>
@@ -1849,7 +1849,7 @@
     <string name="install_applications" msgid="3921609656584369901">"مصادر غير معروفة"</string>
     <string name="install_applications_title" msgid="7890233747559108106">"السماح بكل مصادر التطبيقات"</string>
     <string name="recent_app_category_title" msgid="189758417804427533">"التطبيقات التي تم فتحها مؤخرًا"</string>
-    <string name="see_all_apps_title" msgid="1650653853942381797">"{count,plural, =1{عرض كل التطبيقات}zero{الاطّلاع على كل الـ # تطبيق}two{الاطّلاع على كلا التطبيقَين}few{الاطّلاع على كل الـ # تطبيقات}many{الاطّلاع على كل الـ # تطبيقًا}other{الاطّلاع على كل الـ # تطبيق}}"</string>
+    <string name="see_all_apps_title" msgid="1650653853942381797">"{count,plural, =1{عرض كل التطبيقات}zero{عرض كل التطبيقات الـ #}two{عرض التطبيقَين}few{عرض كل التطبيقات الـ #}many{عرض كل التطبيقات الـ #}other{عرض كل التطبيقات الـ #}}"</string>
     <string name="forgot_password_title" msgid="3967873480875239885">"تواصَل مع مشرف تكنولوجيا معلومات."</string>
     <string name="forgot_password_text" msgid="2583194470767613163">"يمكن أن يساعدك مشرف تكنولوجيا المعلومات في إعادة ضبط رقم التعريف الشخصي أو النقش أو كلمة المرور."</string>
     <string name="advanced_settings" msgid="2368905204839169094">"الإعدادات المتقدمة"</string>
@@ -1886,7 +1886,7 @@
     <string name="app_factory_reset" msgid="8974044931667015201">"إلغاء تثبيت التحديثات"</string>
     <string name="app_restricted_settings_lockscreen_title" msgid="5993061278264872648">"السماح بالإعدادات المحظورة"</string>
     <string name="auto_launch_enable_text" msgid="8912714475823807798">"بعض الأنشطة التي اخترتها يتم فتحها في هذا التطبيق تلقائيًا."</string>
-    <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"لقد اخترت السماح لهذا التطبيق بإنشاء الأدوات والوصول إلى بياناتها."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"لقد اخترت السماح لهذا التطبيق بإنشاء التطبيقات المصغَّرة والوصول إلى بياناتها."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"لم يتم ضبط إعدادات تلقائية."</string>
     <string name="clear_activities" msgid="488089228657585700">"محو الإعدادات المفضّلة التلقائية"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"ربما لم يتم تصميم هذا التطبيق ليلائم شاشتك، يمكنك التحكم في كيفية ضبطه ليلائم شاشتك هنا."</string>
@@ -2171,7 +2171,7 @@
     <string name="widget_picker_title" msgid="7641298325488989676">"اختيار تطبيق مصغَّر"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="3537968409832846255">"هل تريد إنشاء التطبيق المصغَّر والسماح بالوصول؟"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="5825298768068148804">"بعد إنشاء التطبيق المصغَّر، يمكن للتطبيق الوصول إلى كل العناصر المعروضة.\n\nالتطبيق: <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>\nالتطبيق المصغَّر: <xliff:g id="WIDGET_LABEL">%2$s</xliff:g>\n"</string>
-    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7268758525344468364">"السماح دومًا لـ <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> بإنشاء الأدوات والوصول إلى بياناتها"</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7268758525344468364">"السماح دومًا لـ <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> بإنشاء التطبيقات المصغَّرة والوصول إلى بياناتها"</string>
     <string name="testing_usage_stats" msgid="4660643799010906365">"إحصاءات الاستخدام"</string>
     <string name="usage_stats_sort_by_usage_time" msgid="2927310334119998301">"الترتيب حسب وقت الاستخدام"</string>
     <string name="usage_stats_sort_by_last_time_used" msgid="7039213339779884017">"الترتيب حسب وقت آخر استخدام"</string>
@@ -2218,7 +2218,7 @@
     <string name="accessibility_feedback_title" msgid="6690472705407526006">"الملاحظات"</string>
     <string name="accessibility_feedback_summary" msgid="4576591591334314827">"يمكنك المساعدة في تحسين الخدمة من خلال إكمال استطلاع"</string>
     <string name="accessibility_feedback_disabled_summary" msgid="3652321859452620942">"ما مِن استطلاعات متاحة"</string>
-    <string name="user_installed_services_category_title" msgid="2639470729311439731">"التطبيقات التي تم تنزيلها"</string>
+    <string name="user_installed_services_category_title" msgid="2639470729311439731">"التطبيقات التي نزّلتها"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"إعدادات تجريبية"</string>
     <string name="feature_flags_dashboard_title" msgid="348990373716658289">"عناصر التحكّم في الميزات"</string>
     <string name="bt_stack_log_level" msgid="6527899271926969296">"تفعيل سجلّ حزمة البلوتوث"</string>
@@ -2364,7 +2364,7 @@
     <string name="accessibility_button_location_title" msgid="7182107846092304942">"الموقع"</string>
     <string name="accessibility_button_size_title" msgid="5785110470538960881">"حجم الزر"</string>
     <string name="accessibility_button_fade_title" msgid="8081993897680588829">"تلاشي الزر عند عدم استخدامه"</string>
-    <string name="accessibility_button_fade_summary" msgid="7865950833524973709">"تلاشي الزر بعد بضع ثوانٍ، ما يسهِّل عليك رؤية الشاشة"</string>
+    <string name="accessibility_button_fade_summary" msgid="7865950833524973709">"يتلاشي الزر بعد بضع ثوانٍ، ما يسهِّل عليك رؤية الشاشة"</string>
     <string name="accessibility_button_opacity_title" msgid="4727355657530362289">"شفافية الزر عند عدم استخدامه"</string>
     <string name="accessibility_button_low_label" msgid="4193015407828927741">"شفاف"</string>
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"غير شفاف"</string>
@@ -3487,7 +3487,7 @@
     <string name="live_caption_title" msgid="8617086825712756983">"النسخ النصي التلقائي"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"شرح تلقائي للوسائط"</string>
     <string name="spatial_audio_wired_headphones" msgid="2237355789145828648">"سماعات الرأس السلكية"</string>
-    <string name="spatial_audio_text" msgid="8201387855375146000">"الصوت الصادر من الوسائط المتوافقة يصبح أكثر وضوحًا"</string>
+    <string name="spatial_audio_text" msgid="8201387855375146000">"الصوت الصادر من الوسائط المتوافقة يصبح غامرًا أكثر"</string>
     <string name="spatial_summary_off" msgid="8272678804629774378">"غير مفعّل"</string>
     <string name="spatial_summary_on_one" msgid="6239933399496282994">"مفعّل / <xliff:g id="OUTPUT_DEVICE">%1$s</xliff:g>"</string>
     <string name="spatial_summary_on_two" msgid="4526919818832483883">"مفعّل / <xliff:g id="OUTPUT_DEVICE_0">%1$s</xliff:g> و<xliff:g id="OUTPUT_DEVICE_1">%2$s</xliff:g>"</string>
@@ -4446,7 +4446,7 @@
     <string name="suggestion_additional_fingerprints" msgid="4726777300101156208">"إضافة بصمة إصبع أخرى"</string>
     <string name="suggestion_additional_fingerprints_summary" msgid="2825364645039666674">"فتح القفل باستخدام إصبع مختلف"</string>
     <string name="battery_saver_on_summary" msgid="4605146593966255848">"مفعّلة"</string>
-    <string name="battery_saver_off_scheduled_summary" msgid="2193875981740829819">"سيتم التفعيل تلقائيًا عند الوصول إلى <xliff:g id="BATTERY_PERCENTAGE">%1$s</xliff:g>."</string>
+    <string name="battery_saver_off_scheduled_summary" msgid="2193875981740829819">"سيتم التفعيل تلقائيًا عند الوصول إلى <xliff:g id="BATTERY_PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="battery_saver_off_summary" msgid="4411561435493109261">"الميزة غير مفعّلة"</string>
     <string name="app_battery_usage_title" msgid="346558380609793334">"استخدام التطبيقات للبطارية"</string>
     <string name="app_battery_usage_summary" msgid="6349965904306339539">"ضبط إعدادات استخدام التطبيقات للبطارية"</string>
@@ -5373,7 +5373,7 @@
     <string name="reboot_dialog_reboot_now" msgid="235616015988522355">"إعادة التشغيل الآن"</string>
     <string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"إعادة التشغيل لاحقًا"</string>
     <string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"الصوت المكاني"</string>
-    <string name="bluetooth_details_spatial_audio_summary" msgid="5026859623681482668">"الصوت الصادر من الوسائط المتوافقة يصبح أكثر وضوحًا"</string>
+    <string name="bluetooth_details_spatial_audio_summary" msgid="5026859623681482668">"الصوت الصادر من الوسائط المتوافقة يصبح غامرًا أكثر"</string>
     <string name="bluetooth_details_head_tracking_title" msgid="5416972521040337799">"تتبُّع حركة الرأس"</string>
     <string name="bluetooth_details_head_tracking_summary" msgid="3942238746595985395">"يتغيّر الصوت بينما تُحرك رأسك ليبدو طبيعيًا جدًا."</string>
     <string name="bluetooth_details_permissions_sync_title" msgid="7277580382321003521">"مزامنة الأذونات من الهاتف"</string>
@@ -5621,7 +5621,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"حدث خطأ أثناء ضبط الحساب التلقائي"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"لم يتم ضبط حساب تلقائي"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"الجهاز فقط"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"‏الجهاز و%1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"يُرجى إضافة حساب للبدء"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"مكان حفظ جهات الاتصال"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"دائرة البحث"</string>
@@ -5636,4 +5637,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 186755f..ffbffc3 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -2470,6 +2470,7 @@
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"স্ক্রীনত তিনিবাৰ টিপা"</string>
     <string name="accessibility_shortcut_edit_screen_title" msgid="4494142067760961499">"সাধ্য সুবিধাৰ শ্বৰ্টকাটসমূহ সম্পাদনা কৰক"</string>
     <string name="accessibility_shortcut_edit_screen_prompt" msgid="5966054283114856682">"%1$sৰ বাবে আপোনাৰ শ্বৰ্টকাটটো বাছনি কৰক"</string>
+    <!-- String.format failed for translation -->
     <!-- no translation found for accessibility_shortcut_unassigned_setting_unavailable_summary (993486098872935043) -->
     <skip />
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"অব্যাহত ৰাখক"</string>
@@ -5617,7 +5618,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"ডিফ’ল্ট একাউণ্ট ছেট কৰোঁতে আসোঁৱাহ হৈছে"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"কোনো ডিফ’ল্ট ছেট কৰা হোৱা নাই"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"ডিভাইচ মাত্ৰ"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"ডিভাইচ আৰু %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"আৰম্ভ কৰিবলৈ এটা একাউণ্ট যোগ দিয়ক"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"সম্পৰ্কসমূহ ক’ত ছেভ কৰিব লাগে"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"সন্ধান কৰিবৰ বাবে বৃত্ত"</string>
@@ -5628,8 +5630,8 @@
     <string name="device_supervision_switch_title" msgid="3203958797412413373">"ডিভাইচ তদাৰক কৰাৰ সুবিধা ব্যৱহাৰ কৰক"</string>
     <string name="device_supervision_switch_no_pin_summary" msgid="8294396978464347129">"আৰম্ভ কৰিবলৈ পিন ছেট আপ কৰক"</string>
     <string name="keywords_supervision_settings" msgid="2580555201483955376">"তদাৰক, অভিভাৱকীয় তদাৰক, অভিভাৱকীয় নিয়ন্ত্ৰণ"</string>
-    <!-- no translation found for supervision_pin_management_preference_title (961680798581006465) -->
-    <skip />
-    <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
+    <string name="supervision_pin_management_preference_title" msgid="961680798581006465">"পিন পৰিচালনা কৰক"</string>
+    <string name="supervision_pin_management_preference_summary_add" msgid="3244161328612671896">"এটা পিন পুনৰুদ্ধাৰ কৰাৰ পদ্ধতি যোগ দিয়ক"</string>
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
     <skip />
 </resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 0c23b00..376f77d 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Defolt hesabı ayarlayarkən xəta baş verdi"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Defolt ayarlanmayıb"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Yalnız cihaz"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Cihaz və %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Başlamaq üçün hesab əlavə edin"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Kontaktları harada yadda saxlamalı"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Dairəyə alaraq axtarın"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index d51bca0..e2fe6cf 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -2470,8 +2470,7 @@
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"Dodirnite ekran triput"</string>
     <string name="accessibility_shortcut_edit_screen_title" msgid="4494142067760961499">"Izmenite prečice za pristupačnost"</string>
     <string name="accessibility_shortcut_edit_screen_prompt" msgid="5966054283114856682">"Izaberite prečicu za %1$s"</string>
-    <!-- no translation found for accessibility_shortcut_unassigned_setting_unavailable_summary (993486098872935043) -->
-    <skip />
+    <string name="accessibility_shortcut_unassigned_setting_unavailable_summary" msgid="993486098872935043">"Da biste koristili ovo, uključite prečicu %1$s na stranici funkcije pristupačnosti"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"Nastavi"</string>
     <string name="accessibility_hearingaid_title" msgid="1263619711863375614">"Slušni aparati"</string>
     <string name="accessibility_hearingaid_intro" msgid="6686620444104350629">"Podesite slušne aparate koji imaju ASHA i LE Audio, kohlearne implante i uređaje za pojačavanje zvuka i upravljajte njima"</string>
@@ -5618,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Greška pri podešavanju podrazumevanog naloga"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Nije podešen podrazumevani nalog"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Samo uređaj"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Uređaj i %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Dodajte nalog da biste započeli"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Gde možete da čuvate kontakte"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Pretraga zaokruživanjem"</string>
@@ -5629,8 +5629,8 @@
     <string name="device_supervision_switch_title" msgid="3203958797412413373">"Koristi nadzor uređaja"</string>
     <string name="device_supervision_switch_no_pin_summary" msgid="8294396978464347129">"Podesite PIN da biste započeli"</string>
     <string name="keywords_supervision_settings" msgid="2580555201483955376">"nadzor, roditeljski nadzor, roditeljska kontrola"</string>
-    <!-- no translation found for supervision_pin_management_preference_title (961680798581006465) -->
-    <skip />
-    <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
+    <string name="supervision_pin_management_preference_title" msgid="961680798581006465">"Upravljajte PIN-om"</string>
+    <string name="supervision_pin_management_preference_summary_add" msgid="3244161328612671896">"Dodajte metod oporavka PIN-om"</string>
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
     <skip />
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index fe69fd8..3230f90 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -1309,7 +1309,7 @@
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Выключана"</string>
     <string name="display_white_balance_title" msgid="2624544323029364713">"Паказваць баланс белага"</string>
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
-    <string name="fold_lock_behavior_title" msgid="786228803694268449">"Працягваць выкарыстоўваць праграмы, калі прылада складзена"</string>
+    <string name="fold_lock_behavior_title" msgid="786228803694268449">"Выкарыстоўваць праграмы на складзенай прыладзе"</string>
     <string name="disable_game_default_frame_rate_title" msgid="3712908601744143753">"Адключэнне ст. частаты кадраў"</string>
     <string name="disable_game_default_frame_rate_summary" msgid="4436762704707434225">"Адключыць абмежаванне на максімальную частату кадраў для гульняў (<xliff:g id="FRAME_RATE">%1$d</xliff:g> Гц)."</string>
     <string name="peak_refresh_rate_title" msgid="2056355754210341011">"Плаўны паказ"</string>
@@ -2470,8 +2470,7 @@
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"Тройчы націснуць на экран"</string>
     <string name="accessibility_shortcut_edit_screen_title" msgid="4494142067760961499">"Налады хуткага ўключэння спецыяльных магчымасцей"</string>
     <string name="accessibility_shortcut_edit_screen_prompt" msgid="5966054283114856682">"Выберыце спосаб хуткага ўключэння наступнай функцыі: %1$s"</string>
-    <!-- no translation found for accessibility_shortcut_unassigned_setting_unavailable_summary (993486098872935043) -->
-    <skip />
+    <string name="accessibility_shortcut_unassigned_setting_unavailable_summary" msgid="993486098872935043">"Для выкарыстання ўключыце хуткі доступ \"%1$s\" на старонцы спецыяльных магчымасцей"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"Далей"</string>
     <string name="accessibility_hearingaid_title" msgid="1263619711863375614">"Слыхавыя апараты"</string>
     <string name="accessibility_hearingaid_intro" msgid="6686620444104350629">"Наладжвайце кахлеарныя імпланты, слыхавыя апараты ASHA і LE Audio і іншыя прылады для ўзмацнення гуку і кіруйце імі"</string>
@@ -5619,7 +5618,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Падчас вызначэння стандартнага ўліковага запісу адбылася памылка"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Стандартны ўліковы запіс не вызначаны"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Толькі прылада"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Прылада і %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Каб пачаць, дадайце ўліковы запіс"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Дзе будуць захоўвацца кантакты"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Абвесці для пошуку"</string>
@@ -5630,8 +5630,8 @@
     <string name="device_supervision_switch_title" msgid="3203958797412413373">"Ажыццяўляць бацькоўскі кантроль за прыладай"</string>
     <string name="device_supervision_switch_no_pin_summary" msgid="8294396978464347129">"Каб пачаць, усталюйце PIN-код"</string>
     <string name="keywords_supervision_settings" msgid="2580555201483955376">"кантроль, бацькоўскі кантроль, элементы бацькоўскага кантролю"</string>
-    <!-- no translation found for supervision_pin_management_preference_title (961680798581006465) -->
-    <skip />
-    <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
+    <string name="supervision_pin_management_preference_title" msgid="961680798581006465">"Кіраваць PIN-кодам"</string>
+    <string name="supervision_pin_management_preference_summary_add" msgid="3244161328612671896">"Дадаць спосаб аднаўлення з дапамогай PIN-кода"</string>
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
     <skip />
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 495efd7..45efe77 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Грешка при задаването на стандартния профил"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Няма стандартен профил"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Само чрез устройството"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Устройство и %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"За да започнете, добавете профил"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Къде да се запазват контактите"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Търсене с ограждане"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 381fb48..5eabaeb 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"ডিফল্ট অ্যাকাউন্ট সেট করার সময় কোনও সমস্যা হয়েছে"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"কোনও ডিফল্ট অ্যাকাউন্ট সেট করা নেই"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"শুধুমাত্র ডিভাইস"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"ডিভাইস ও %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"শুরু করতে একটি অ্যাকাউন্ট যোগ করুন"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"পরিচিতি কোথায় সেভ করব"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"খোঁজার জন্য সার্কেল বানান"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 2374bf9..ecd961b 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -2470,8 +2470,7 @@
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"Trostruki dodir ekrana"</string>
     <string name="accessibility_shortcut_edit_screen_title" msgid="4494142067760961499">"Uredite prečice za pristupačnost"</string>
     <string name="accessibility_shortcut_edit_screen_prompt" msgid="5966054283114856682">"Odaberite prečicu za %1$s"</string>
-    <!-- no translation found for accessibility_shortcut_unassigned_setting_unavailable_summary (993486098872935043) -->
-    <skip />
+    <string name="accessibility_shortcut_unassigned_setting_unavailable_summary" msgid="993486098872935043">"Da biste to upotrebljavali, uključite prečac %1$s na stranici značajke pristupačnosti"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"Nastavi"</string>
     <string name="accessibility_hearingaid_title" msgid="1263619711863375614">"Slušni aparati"</string>
     <string name="accessibility_hearingaid_intro" msgid="6686620444104350629">"Postavite ASHA i LE Audio slušne aparate, kohlearne implantate i druge uređaje za pojačavanje zvuka te upravljajte njima"</string>
@@ -5618,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Došlo je do greške prilikom postavljanja zadanog računa"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Zadani račun nije postavljen"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Samo uređaj"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Uređaj i %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Dodajte račun da započnete"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Gdje pohranjivati kontakte"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Pretraživanje zaokruživanjem"</string>
@@ -5629,8 +5629,8 @@
     <string name="device_supervision_switch_title" msgid="3203958797412413373">"Koristi nadzor uređaja"</string>
     <string name="device_supervision_switch_no_pin_summary" msgid="8294396978464347129">"Postavite PIN da započnete"</string>
     <string name="keywords_supervision_settings" msgid="2580555201483955376">"nadzor, roditeljski nadzor, roditeljske kontrole"</string>
-    <!-- no translation found for supervision_pin_management_preference_title (961680798581006465) -->
-    <skip />
-    <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
+    <string name="supervision_pin_management_preference_title" msgid="961680798581006465">"Upravljajte PIN-om"</string>
+    <string name="supervision_pin_management_preference_summary_add" msgid="3244161328612671896">"Dodajte način oporavka PIN-a"</string>
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
     <skip />
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 058f185..f0fd87e 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -5618,7 +5618,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Hi ha hagut un error en definir el compte predeterminat"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Cap compte predeterminat definit"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Només dispositiu"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Dispositiu i %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Afegeix un compte per començar"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"On desar els contactes"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Encercla per cercar"</string>
@@ -5633,4 +5634,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index e07d240..d919e63 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -5619,7 +5619,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Při nastavování výchozího účtu došlo k chybě"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Žádné výchozí nastavení"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Pouze zařízení"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Zařízení a %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Začněte tím, že přidáte účet"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Kam uložit kontakty"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Zakroužkuj a hledej"</string>
@@ -5634,4 +5635,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 236c346..a19271a 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -2470,8 +2470,7 @@
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"Tryk tre gange på skærmen"</string>
     <string name="accessibility_shortcut_edit_screen_title" msgid="4494142067760961499">"Rediger genveje til hjælpefunktioner"</string>
     <string name="accessibility_shortcut_edit_screen_prompt" msgid="5966054283114856682">"Vælg din genvej til %1$s"</string>
-    <!-- no translation found for accessibility_shortcut_unassigned_setting_unavailable_summary (993486098872935043) -->
-    <skip />
+    <string name="accessibility_shortcut_unassigned_setting_unavailable_summary" msgid="993486098872935043">"Hvis du vil benytte denne funktion, skal du aktivere genvejen til %1$s på siden for en hjælpefunktion"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"Fortsæt"</string>
     <string name="accessibility_hearingaid_title" msgid="1263619711863375614">"Høreapparater"</string>
     <string name="accessibility_hearingaid_intro" msgid="6686620444104350629">"Konfigurer og administrer høreapparater, der understøtter ASHA og LE-lyd, cochlear-implantater og andre enheder til lydforstærkning"</string>
@@ -5617,7 +5616,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Der opstod en fejl under konfigurationen af standardkontoen"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Der er ikke angivet nogen standardkonto"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Kun på enheden"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Enhed og %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Tilføj en konto for at komme godt i gang"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Hvor kontakter skal gemmes"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Circle to Search"</string>
@@ -5628,8 +5628,8 @@
     <string name="device_supervision_switch_title" msgid="3203958797412413373">"Brug forældrestyring af enhed"</string>
     <string name="device_supervision_switch_no_pin_summary" msgid="8294396978464347129">"Konfigurer en pinkode for at komme i gang"</string>
     <string name="keywords_supervision_settings" msgid="2580555201483955376">"forældrestyring, indstillinger for børnesikring, børnesikring"</string>
-    <!-- no translation found for supervision_pin_management_preference_title (961680798581006465) -->
-    <skip />
-    <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
+    <string name="supervision_pin_management_preference_title" msgid="961680798581006465">"Administrer pinkode"</string>
+    <string name="supervision_pin_management_preference_summary_add" msgid="3244161328612671896">"Tilføj en metode til gendannelse af pinkode"</string>
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
     <skip />
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 3e524f0..80df7a4 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -4049,7 +4049,7 @@
     <string name="zen_mode_trigger_title_generic" msgid="1347753445938095789">"App-Einstellungen"</string>
     <string name="zen_mode_trigger_summary_settings_in_app" msgid="4860667191183702601">"Informationen und Einstellungen in <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <string name="zen_mode_trigger_summary_managed_by_app" msgid="8631011868193102098">"Verwaltet von <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="zen_mode_confirm_disable_mode_title" msgid="7314998098582325018">"<xliff:g id="MODE_NAME">%1$s</xliff:g> deaktivieren?"</string>
+    <string name="zen_mode_confirm_disable_mode_title" msgid="7314998098582325018">"„<xliff:g id="MODE_NAME">%1$s</xliff:g>“ deaktivieren?"</string>
     <string name="zen_mode_confirm_disable_message" msgid="2703882646066764140">"Bei Deaktivierung wird dieser Modus nie aktiviert"</string>
     <string name="zen_mode_action_disable" msgid="3552921561331044881">"Deaktivieren"</string>
     <string name="zen_mode_confirm_enable_mode_title" msgid="6020902148457106017">"„<xliff:g id="MODE_NAME">%1$s</xliff:g>“ aktivieren?"</string>
@@ -4178,7 +4178,7 @@
     <string name="default_digital_assistant_title" msgid="5654663086385490838">"Standard-App digit. Assistent"</string>
     <string name="assistant_security_warning_agree" msgid="9013334158753473359">"Zustimmen"</string>
     <string name="default_browser_title" msgid="8342074390782390458">"Browser-App"</string>
-    <string name="default_phone_title" msgid="7616730756650803827">"Telefonie-App"</string>
+    <string name="default_phone_title" msgid="7616730756650803827">"Telefon App"</string>
     <string name="system_app" msgid="1863291702508355041">"(System)"</string>
     <string name="apps_storage" msgid="643866814746927111">"Speicher für Apps"</string>
     <string name="usage_access" msgid="5487993885373893282">"Zugriff auf Nutzungsdaten"</string>
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Fehler beim Festlegen des Standardkontos"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Kein Standard festgelegt"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Nur Gerät"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Gerät und %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Füge ein Konto hinzu, um loszulegen"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Speicherort für Kontakte"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Circle to Search"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index f444e9c..db66007 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Σφάλμα κατά τον ορισμό προεπιλεγμένου λογαριασμού"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Δεν ορίστηκε προεπιλογή"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Μόνο από συσκευή"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Συσκευή και %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Για να ξεκινήσετε, προσθέστε λογαριασμό"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Πού μπορείτε να αποθηκεύσετε επαφές"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Κυκλώστε για αναζήτηση"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index d53f94f..39ede5a 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Error setting the default account"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"No default set"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Device only"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Device and %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Add an account to get started"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Where to save contacts"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Circle to Search"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 97dd989..88f0fc6 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -5616,7 +5616,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Error setting the default account"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"No default set"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Device only"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Device and %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Add an account to get started"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Where to save contacts"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Circle to Search"</string>
@@ -5629,4 +5630,5 @@
     <string name="keywords_supervision_settings" msgid="2580555201483955376">"supervision, parental supervision, parental controls"</string>
     <string name="supervision_pin_management_preference_title" msgid="961680798581006465">"Manage PIN"</string>
     <string name="supervision_pin_management_preference_summary_add" msgid="3244161328612671896">"Add a PIN recovery method"</string>
+    <string name="supervision_change_pin_preference_title" msgid="2288584039438231801">"Change PIN"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 5ae6bbd..b816ff6 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Error setting the default account"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"No default set"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Device only"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Device and %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Add an account to get started"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Where to save contacts"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Circle to Search"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 2c2c79a..52da533 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Error setting the default account"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"No default set"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Device only"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Device and %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Add an account to get started"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Where to save contacts"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Circle to Search"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 31f52ff..d382147 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -638,7 +638,7 @@
     <string name="private_space_biometric_unlock_title" msgid="1978145237698659673">"Desbloqueo facial y con huella dactilar en espacio privado"</string>
     <string name="private_space_fingerprint_enroll_introduction_title" msgid="5187730641333680942">"Configura el Desbloqueo con huellas dactilares para el espacio privado"</string>
     <string name="private_space_fingerprint_enroll_introduction_message" msgid="9092068873421435300">"Usa tu huella dactilar para desbloquear el espacio privado o verificar tu identidad, por ejemplo, cuando accedes a apps o apruebas compras"</string>
-    <string name="private_space_fingerprint_enroll_introduction_footer_message" msgid="7125255484447984854">"Tu espacio privado se puede desbloquear, aunque no lo desees, por ejemplo, cuando alguien sostiene tu teléfono frente a tu dedo."</string>
+    <string name="private_space_fingerprint_enroll_introduction_footer_message" msgid="7125255484447984854">"Tu espacio privado se puede desbloquear aunque no lo desees, por ejemplo, cuando alguien sostiene tu teléfono frente a tu dedo."</string>
     <string name="private_space_fingerprint_enroll_finish_message" msgid="4754797926493316965">"Usa tu huella dactilar para desbloquear el espacio privado o aprobar compras"</string>
     <string name="private_space_face_enroll_introduction_title" msgid="3717541082520006032">"Configura el Desbloqueo facial para el espacio privado"</string>
     <string name="private_space_face_enroll_introduction_message" msgid="250239418499081821">"Usa tu rostro para desbloquear tu espacio privado o verificar tu identidad, por ejemplo, cuando accedes a apps o apruebas compras."</string>
@@ -1380,7 +1380,7 @@
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Después de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
     <string name="screen_timeout_summary_not_set" msgid="5107680774964178875">"No establecido"</string>
     <string name="wallpaper_settings_title" msgid="5635129851136006383">"Fondo de pantalla"</string>
-    <string name="style_and_wallpaper_settings_title" msgid="2232042809407308946">"Estilo y fondo de pantalla"</string>
+    <string name="style_and_wallpaper_settings_title" msgid="2232042809407308946">"Fondo de pantalla y estilo"</string>
     <string name="wallpaper_dashboard_summary" msgid="2324472863981057118">"Pantalla principal, pantalla de bloqueo"</string>
     <string name="wallpaper_suggestion_title" msgid="3812842717939877330">"Cambiar fondo de pantalla"</string>
     <string name="wallpaper_suggestion_summary" msgid="9077061486716754784">"Personalizar tu pantalla"</string>
@@ -2470,8 +2470,7 @@
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"Presionar tres veces la pantalla"</string>
     <string name="accessibility_shortcut_edit_screen_title" msgid="4494142067760961499">"Editar combinaciones de accesibilidad"</string>
     <string name="accessibility_shortcut_edit_screen_prompt" msgid="5966054283114856682">"Elige tu combinación de teclas para %1$s"</string>
-    <!-- no translation found for accessibility_shortcut_unassigned_setting_unavailable_summary (993486098872935043) -->
-    <skip />
+    <string name="accessibility_shortcut_unassigned_setting_unavailable_summary" msgid="993486098872935043">"Para usar esta función, activa la combinación de teclas %1$s en la página de una función de accesibilidad"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"Continuar"</string>
     <string name="accessibility_hearingaid_title" msgid="1263619711863375614">"Dispositivos auditivos"</string>
     <string name="accessibility_hearingaid_intro" msgid="6686620444104350629">"Configura y gestiona audífonos ASHA y LE Audio, implantes cocleares y otros dispositivos de amplificación de sonido"</string>
@@ -2763,7 +2762,7 @@
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Activado"</string>
-    <string name="battery_saver_master_switch_title" msgid="3474312070095834915">"Usar el Ahorro de batería"</string>
+    <string name="battery_saver_master_switch_title" msgid="3474312070095834915">"Usar Ahorro de batería"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="7857393318205740864">"Activar automáticamente"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6194649389871448663">"Nunca"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="4294335680892392449">"con <xliff:g id="PERCENT">%1$s</xliff:g> de batería"</string>
@@ -3489,7 +3488,7 @@
     <string name="spatial_audio_wired_headphones" msgid="2237355789145828648">"Auriculares con cable"</string>
     <string name="spatial_audio_text" msgid="8201387855375146000">"El audio del contenido multimedia compatible se hace más envolvente"</string>
     <string name="spatial_summary_off" msgid="8272678804629774378">"No"</string>
-    <string name="spatial_summary_on_one" msgid="6239933399496282994">"Sí (<xliff:g id="OUTPUT_DEVICE">%1$s</xliff:g>)"</string>
+    <string name="spatial_summary_on_one" msgid="6239933399496282994">"Sí / <xliff:g id="OUTPUT_DEVICE">%1$s</xliff:g>"</string>
     <string name="spatial_summary_on_two" msgid="4526919818832483883">"Sí (<xliff:g id="OUTPUT_DEVICE_0">%1$s</xliff:g> y <xliff:g id="OUTPUT_DEVICE_1">%2$s</xliff:g>)"</string>
     <string name="spatial_audio_footer_title" msgid="8775010547623606088">"También puedes activar el audio espacial para dispositivos Bluetooth."</string>
     <string name="spatial_audio_footer_learn_more_text" msgid="3826811708094366301">"Configuración de dispositivos conectados"</string>
@@ -5617,7 +5616,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Se produjo un error al establecer la cuenta predeterminada"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"No hay cuenta predeterminada"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Solo en dispositivo"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Dispositivo y %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Agrega una cuenta para comenzar"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Dónde guardar los contactos"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Busca con un círculo"</string>
@@ -5628,8 +5628,8 @@
     <string name="device_supervision_switch_title" msgid="3203958797412413373">"Usar la supervisión de dispositivos"</string>
     <string name="device_supervision_switch_no_pin_summary" msgid="8294396978464347129">"Configurar un PIN para comenzar"</string>
     <string name="keywords_supervision_settings" msgid="2580555201483955376">"supervisión, supervisión parental, controles parentales"</string>
-    <!-- no translation found for supervision_pin_management_preference_title (961680798581006465) -->
-    <skip />
-    <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
+    <string name="supervision_pin_management_preference_title" msgid="961680798581006465">"Administra tu PIN"</string>
+    <string name="supervision_pin_management_preference_summary_add" msgid="3244161328612671896">"Agrega un método de recuperación de PIN"</string>
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
     <skip />
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index e221668..8f14d2a 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1792,7 +1792,7 @@
     <string name="lockpassword_remote_validation_pin_details" msgid="2373654227583206297">"Para transferir las cuentas de Google, los ajustes y más, introduce el PIN de tu otro dispositivo. Tu PIN estará cifrado."</string>
     <string name="lockpassword_remote_validation_password_details" msgid="3482328925925888340">"Para transferir las cuentas de Google, los ajustes y más, introduce la contraseña de tu otro dispositivo. Tu contraseña estará cifrada."</string>
     <string name="lockpassword_remote_validation_set_pattern_as_screenlock" msgid="7595104317648465901">"Usar el patrón también para desbloquear"</string>
-    <string name="lockpassword_remote_validation_set_pin_as_screenlock" msgid="509672303005547218">"Usar el PIN también para desbloquear este dispositivo"</string>
+    <string name="lockpassword_remote_validation_set_pin_as_screenlock" msgid="509672303005547218">"Usar el PIN también para desbloquear"</string>
     <string name="lockpassword_remote_validation_set_password_as_screenlock" msgid="2066701840753591922">"Usar la contraseña también para desbloquear"</string>
     <string name="lockpassword_confirm_repair_mode_pattern_header" msgid="6669435143987988314">"Verifica el patrón"</string>
     <string name="lockpassword_confirm_repair_mode_pin_header" msgid="2585263648322879131">"Verifica el PIN"</string>
@@ -4564,7 +4564,7 @@
     <string name="edge_to_edge_navigation_title" msgid="714427081306043819">"Navegación por gestos"</string>
     <string name="edge_to_edge_navigation_summary" msgid="818109176611921504">"Para ir a la pantalla de inicio, desliza hacia arriba desde la parte inferior de la pantalla. Para cambiar de aplicación, desliza hacia arriba desde la parte inferior de la pantalla, mantenla pulsada y levanta el dedo. Para ir atrás, desliza desde el borde izquierdo o el derecho."</string>
     <string name="legacy_navigation_title" msgid="7877402855994423727">"Navegación con 3 botones"</string>
-    <string name="legacy_navigation_summary" msgid="5905301067778326433">"Ve hacia atrás, a la pantalla de inicio o cambia de aplicación con botones en la parte inferior de la pantalla."</string>
+    <string name="legacy_navigation_summary" msgid="5905301067778326433">"Ve hacia atrás, a la pantalla de inicio y cambia de aplicación con botones en la parte inferior de la pantalla."</string>
     <string name="nav_tutorial_button_description" msgid="7195363082216233970">"Iniciar tutorial de navegación por gestos"</string>
     <string name="keywords_system_navigation" msgid="3131782378486554934">"navegación del sistema, navegación con 2 botones, navegación con 3 botones, navegación por gestos, deslizar"</string>
     <string name="assistant_gesture_category_title" msgid="2478251256585807920">"Asistente digital"</string>
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"No se ha podido definir la cuenta predeterminada"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Ninguna cuenta predeterminada definida"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Solo en el dispositivo"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Dispositivo y %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Añade una cuenta para empezar"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Dónde guardar los contactos"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Rodea para buscar"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index df00713..e79d9cb 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -2470,8 +2470,7 @@
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"Kolmikpuudutuse ekraanikuva"</string>
     <string name="accessibility_shortcut_edit_screen_title" msgid="4494142067760961499">"Juurdepääsetavuse otseteede muutmine"</string>
     <string name="accessibility_shortcut_edit_screen_prompt" msgid="5966054283114856682">"Valige funktsiooni(de) %1$s jaoks otsetee."</string>
-    <!-- no translation found for accessibility_shortcut_unassigned_setting_unavailable_summary (993486098872935043) -->
-    <skip />
+    <string name="accessibility_shortcut_unassigned_setting_unavailable_summary" msgid="993486098872935043">"Selle kasutamiseks lülitage juurdepääsetavuse funktsiooni lehel sisse otsetee %1$s"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"Jätka"</string>
     <string name="accessibility_hearingaid_title" msgid="1263619711863375614">"Kuuldeseadmed"</string>
     <string name="accessibility_hearingaid_intro" msgid="6686620444104350629">"Saate seadistada ja hallata ASHA ning LE Audio toega kuuldeaparaate, kõrvaimplantaate ja muid võimendusseadmeid"</string>
@@ -5617,7 +5616,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Viga vaikekonto seadistamisel"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Ühtegi vaikekontot pole määratud"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Ainult seade"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Seade ja %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Lisage alustamiseks konto"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Kus kontakte salvestada?"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Ring otsimiseks"</string>
@@ -5628,8 +5628,8 @@
     <string name="device_supervision_switch_title" msgid="3203958797412413373">"Seadme järelevalve kasutamine"</string>
     <string name="device_supervision_switch_no_pin_summary" msgid="8294396978464347129">"Alustamiseks seadistage PIN-kood"</string>
     <string name="keywords_supervision_settings" msgid="2580555201483955376">"järelevalve, vanemlik järelevalve"</string>
-    <!-- no translation found for supervision_pin_management_preference_title (961680798581006465) -->
-    <skip />
-    <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
+    <string name="supervision_pin_management_preference_title" msgid="961680798581006465">"PIN-koodi haldamine"</string>
+    <string name="supervision_pin_management_preference_summary_add" msgid="3244161328612671896">"PIN-koodi taastamise meetodi lisamine"</string>
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
     <skip />
 </resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index e2c5781..e6fdda4 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Errore bat gertatu da kontu lehenetsia ezartzean"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Ez da ezarri kontu lehenetsirik"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Gailua soilik"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Gailua eta %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Hasteko, gehitu kontu bat"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Non gorde kontaktuak?"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Inguratu bilatzeko"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 6f7ab9e..e196857 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -2470,8 +2470,7 @@
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"سه ضربه روی صفحه بزنید"</string>
     <string name="accessibility_shortcut_edit_screen_title" msgid="4494142067760961499">"ویرایش میان‌برهای دسترس‌پذیری"</string>
     <string name="accessibility_shortcut_edit_screen_prompt" msgid="5966054283114856682">"‏میان‌بر %1$s را انتخاب کنید"</string>
-    <!-- no translation found for accessibility_shortcut_unassigned_setting_unavailable_summary (993486098872935043) -->
-    <skip />
+    <string name="accessibility_shortcut_unassigned_setting_unavailable_summary" msgid="993486098872935043">"‏برای استفاده از این، میان‌بر %1$s را در صفحه یکی از ویژگی‌های دسترس‌پذیری روشن کنید"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"ادامه"</string>
     <string name="accessibility_hearingaid_title" msgid="1263619711863375614">"دستگاه‌های کمک‌شنوایی"</string>
     <string name="accessibility_hearingaid_intro" msgid="6686620444104350629">"راه‌اندازی و مدیریت سمعک‌های سازگار با «جاری‌سازی صوتی ویژه سمعک‌ها» و «صدای کم‌مصرف»، کاشت حلزون، و دیگر دستگاه‌های تقویت صدا"</string>
@@ -5617,7 +5616,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"خطا هنگام تنظیم حساب پیش‌فرض"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"حساب پیش‌فرضی تنظیم نشده است"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"فقط دستگاه"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"‏دستگاه و %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"برای شروع، حسابی اضافه کنید"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"محل ذخیره شدن مخاطبین"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"حلقه جستجو"</string>
@@ -5628,8 +5628,8 @@
     <string name="device_supervision_switch_title" msgid="3203958797412413373">"استفاده از نظارت بر دستگاه"</string>
     <string name="device_supervision_switch_no_pin_summary" msgid="8294396978464347129">"برای شروع به کار، پین تنظیم کنید"</string>
     <string name="keywords_supervision_settings" msgid="2580555201483955376">"نظارت، نظارت والدین، کنترل‌های والدین"</string>
-    <!-- no translation found for supervision_pin_management_preference_title (961680798581006465) -->
-    <skip />
-    <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
+    <string name="supervision_pin_management_preference_title" msgid="961680798581006465">"مدیریت پین"</string>
+    <string name="supervision_pin_management_preference_summary_add" msgid="3244161328612671896">"افزودن روش بازیابی پین"</string>
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
     <skip />
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index f51bdd6..3023fca 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -2067,7 +2067,7 @@
     <string name="trackpad_reverse_scrolling_title" msgid="422877284529360866">"Käänteinen vieritys"</string>
     <string name="trackpad_reverse_scrolling_summary" msgid="6048648562887499036">"Sisältö siirtyy ylös, kun vierität alas"</string>
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Klikkaa oikeaa alakulmaa"</string>
-    <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Lisäasetukset: klikkaa kosketuslevyn oikeaa alakulmaa"</string>
+    <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Näet lisäasetukset, kun klikkaat kosketuslevyn oikeaa alakulmaa"</string>
     <string name="trackpad_pointer_speed" msgid="5672221910698079303">"Kohdistimen nopeus"</string>
     <string name="three_finger_tap_preference_title" msgid="2114347152933865780">"Muokkaa kolmoisnapautusta"</string>
     <string name="touchpad_acceleration_title" msgid="176627555191021888">"Kosketuslevyn nopeuttaminen"</string>
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Oletustilin valinta epäonnistui"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Ei oletusta"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Vain laite"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Laite ja %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Aloita lisäämällä tili"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Minne yhteystiedot tallennetaan"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Circle to Search"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 1e803ff..b5e8445 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -4132,7 +4132,7 @@
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> utilisé(s) dans : <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"stockage interne"</string>
     <string name="storage_type_external" msgid="125078274000280821">"stockage externe"</string>
-    <string name="data_summary_format" msgid="8802057788950096650">"<xliff:g id="SIZE">%1$s</xliff:g> utilisés depuis <xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="data_summary_format" msgid="8802057788950096650">"<xliff:g id="SIZE">%1$s</xliff:g> utilisés depuis le <xliff:g id="DATE">%2$s</xliff:g>"</string>
     <string name="storage_used" msgid="2591194906751432725">"Espace de stockage utilisé"</string>
     <string name="change" msgid="273206077375322595">"Modifier"</string>
     <string name="change_storage" msgid="8773820275624113401">"Modifier type de stockage"</string>
@@ -4177,8 +4177,8 @@
     <string name="default_assist_title" msgid="1182435129627493758">"Appli d\'assistant numérique"</string>
     <string name="default_digital_assistant_title" msgid="5654663086385490838">"Assistant numérique par défaut"</string>
     <string name="assistant_security_warning_agree" msgid="9013334158753473359">"J\'accepte"</string>
-    <string name="default_browser_title" msgid="8342074390782390458">"Appli de navigateur"</string>
-    <string name="default_phone_title" msgid="7616730756650803827">"Appli de téléphonie"</string>
+    <string name="default_browser_title" msgid="8342074390782390458">"Appli de navigation"</string>
+    <string name="default_phone_title" msgid="7616730756650803827">"Appli Téléphone"</string>
     <string name="system_app" msgid="1863291702508355041">"(Système)"</string>
     <string name="apps_storage" msgid="643866814746927111">"Stockage des applis"</string>
     <string name="usage_access" msgid="5487993885373893282">"Accès aux données d\'utilisation"</string>
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Erreur lors de la définition du compte par défaut"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Aucun compte par défaut n\'a été défini"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Appareil uniquement"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Appareil et %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Ajoutez un compte pour commencer"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Où enregistrer les contacts"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Encercler et rechercher"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index b0452b4..b1e0539 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -4603,7 +4603,7 @@
     <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Émettre l\'alarme à compte à rebours"</string>
     <string name="emergency_gesture_sound_setting_summary" msgid="6573377104470235173">"Émettre un signal sonore très fort au lancement de SOS Urgence"</string>
     <string name="emergency_gesture_category_call_for_help_title" msgid="1680040129478289510">"Demander de l\'aide"</string>
-    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Appeler les secours"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Appeler à l\'aide"</string>
     <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Numéro à composer pour appeler au secours"</string>
     <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g> (appuyer pour modifier la sélection)"</string>
     <string name="emergency_gesture_number_override_notes" msgid="233018570696200402">"Si vous saisissez un numéro autre que celui des services d\'urgence :\n • Votre appareil doit être déverrouillé pour que vous puissiez utiliser SOS Urgence.\n • Il est possible que votre appel ne soit pas traité."</string>
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Erreur lors de la définition du compte par défaut"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Aucun compte par défaut n\'a été défini"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Appareil uniquement"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Appareil et %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Ajoutez un compte pour commencer"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Où enregistrer les contacts"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Entourer pour chercher"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 778e30f..43844d5 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -5618,7 +5618,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Produciuse un erro ao configurar a conta predeterminada"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Ningunha conta predeterminada definida"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Só dispositivo"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Dispositivo e %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Engade unha conta para comezar"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Onde gardar os contactos"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Rodear para buscar"</string>
@@ -5633,4 +5634,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-gu/arrays.xml b/res/values-gu/arrays.xml
index b5b7b34..2625130 100644
--- a/res/values-gu/arrays.xml
+++ b/res/values-gu/arrays.xml
@@ -356,7 +356,7 @@
     <item msgid="747238414788976867">"કસ્ટમ"</item>
   </string-array>
   <string-array name="accessibility_button_location_selector_titles">
-    <item msgid="6485511780196327736">"અન્ય ઍપની ઉપર ફ્લોટિંગ"</item>
+    <item msgid="6485511780196327736">"અન્ય ઍપની ઉપર ફ્લોટિંગ કરતું"</item>
     <item msgid="3605616699204153590">"નૅવિગેશન બાર"</item>
   </string-array>
   <string-array name="accessibility_button_gesture_selector_titles">
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 8b61602..ec95b99 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -1375,7 +1375,7 @@
     <string name="dark_ui_modes_footer_summary" msgid="1041117250408363391">"{count,plural,offset:2 =0{મોડ ડાર્ક થીમને પણ સક્રિય કરી શકે છે}=1{{mode_1} ડાર્ક થીમને પણ સક્રિય કરી શકે છે}=2{{mode_1} અને {mode_2} ડાર્ક થીમને પણ સક્રિય કરી શકે છે}=3{{mode_1}, {mode_2} અને {mode_3} ડાર્ક થીમને પણ સક્રિય કરી શકે છે}one{{mode_1}, {mode_2} અને વધુ # ડાર્ક થીમને પણ સક્રિય કરી શકે છે}other{{mode_1}, {mode_2} અને વધુ # ડાર્ક થીમને પણ સક્રિય કરી શકે છે}}"</string>
     <string name="dark_ui_modes_footer_action" msgid="80671811848446248">"મોડના સેટિંગ"</string>
     <string name="even_dimmer_display_title" msgid="4509732439977906028">"એક્સ્ટ્રા ડિમ"</string>
-    <string name="even_dimmer_display_summary" msgid="120301078873242172">"ડિવાઇસને સામાન્ય કરતાં વધુ ઝાંખું થવા દો"</string>
+    <string name="even_dimmer_display_summary" msgid="120301078873242172">"ડિવાઇસને સામાન્ય કરતાં વધુ ડિમ થવા દો"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"સ્ક્રીનનો ઑટોમૅટિક સમાપ્તિ સમય"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"નિષ્ક્રિયતાના <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> પછી"</string>
     <string name="screen_timeout_summary_not_set" msgid="5107680774964178875">"સેટ નથી"</string>
@@ -2661,7 +2661,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"ઇતિહાસ વિગતો"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"બૅટરીનો વપરાશ"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"છેલ્લા 24 કલાકનો વપરાશ જુઓ"</string>
-    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"છેલ્લે પૂર્ણ ચાર્જ કર્યા પછી, કરાયેલો વપરાશ જુઓ"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"છેલ્લે પૂર્ણ ચાર્જ કર્યા પછીનો વપરાશ જુઓ"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"ઍપ દ્વારા બૅટરીનો વપરાશ"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"વિગતોનો ઉપયોગ કરો"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"પાવર વપરાશ સમાયોજિત કરો"</string>
@@ -3457,7 +3457,7 @@
     <string name="call_volume_option_title" msgid="1461105986437268924">"કૉલ વૉલ્યૂમ"</string>
     <string name="alarm_volume_option_title" msgid="6398641749273697140">"અલાર્મ વૉલ્યૂમ"</string>
     <string name="ring_volume_option_title" msgid="1520802026403038560">"રિંગ અને નોટિફિકેશનનું વૉલ્યૂમ"</string>
-    <string name="separate_ring_volume_option_title" msgid="2212910223857375951">"રિંગનું વૉલ્યૂમ"</string>
+    <string name="separate_ring_volume_option_title" msgid="2212910223857375951">"રિંગ વૉલ્યૂમ"</string>
     <string name="notification_volume_option_title" msgid="4838818791683615978">"નોટિફિકેશન વૉલ્યૂમ"</string>
     <string name="ringer_content_description_silent_mode" msgid="1442257660889685934">"રિંગર સાઇલન્ટ છે"</string>
     <string name="ringer_content_description_vibrate_mode" msgid="5946432791951870480">"રિંગર વાઇબ્રેટ મોડમાં છે"</string>
@@ -3486,7 +3486,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"ચાલુ થવા પર વાગનાર ધ્વનિ"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"લાઇવ કૅપ્શન"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"મીડિયામાં કૅપ્શન ઑટોમૅટિક રીતે ઉમેરો"</string>
-    <string name="spatial_audio_wired_headphones" msgid="2237355789145828648">"વાયરવાળા હૅડફોન"</string>
+    <string name="spatial_audio_wired_headphones" msgid="2237355789145828648">"વાયર્ડ હૅડફોન"</string>
     <string name="spatial_audio_text" msgid="8201387855375146000">"સુસંગત મીડિયાનો ઑડિયો વધુ ઇમર્સિવ બને છે"</string>
     <string name="spatial_summary_off" msgid="8272678804629774378">"બંધ"</string>
     <string name="spatial_summary_on_one" msgid="6239933399496282994">"ચાલુ / <xliff:g id="OUTPUT_DEVICE">%1$s</xliff:g>"</string>
@@ -5613,11 +5613,12 @@
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"સંપર્કો માટે સ્ટોરેજ"</string>
     <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_selection_message" msgid="8082077300632059003">"ડિફૉલ્ટ તરીકે, સંપર્કોને તમારા ડિવાઇસમાં સાચવવામાં આવશે અને તમારા એકાઉન્ટ સાથે સિંક કરવામાં આવશે"</string>
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"ડિફૉલ્ટ એકાઉન્ટ સેટ કરવામાં ભૂલ આવી"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"કોઈ ડિફૉલ્ટ સેટ નથી"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"ફક્ત ડિવાઇસ"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"ડિવાઇસ અને %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"શરૂ કરવા માટે કોઈ એકાઉન્ટ ઉમેરો"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"સંપર્કો ક્યાં સાચવવા"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"શોધવા માટે વર્તુળ દોરો"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 4000309..64ebd1f 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -578,7 +578,7 @@
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"पहले अपनी उंगली के एक किनारे को सेंसर पर कुछ देर के लिए रखें और फिर दूसरी तरफ़ से भी ऐसा करें"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="352947044008973812">"क्या आपको फ़िंगरप्रिंट सेटअप नहीं करना?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="4876965433600560365">"आपने अपने फ़ोन को अनलॉक करने के एक तरीके के रूप में अपने फ़िंगरप्रिंट का उपयोग करने का चुनाव किया है. अगर आप इसे अभी छोड़ते हैं, तो आपको इसे बाद में सेट करना होगा. सेटअप में करीब एक मिनट लगता है."</string>
-    <string name="lock_screen_skip_setup_title" msgid="6979006375138175111">"क्या <xliff:g id="OPTIONS">%s</xliff:g> के लिए सेटअप स्किप करना है?"</string>
+    <string name="lock_screen_skip_setup_title" msgid="6979006375138175111">"क्या <xliff:g id="OPTIONS">%s</xliff:g> के लिए सेटअप नहीं करना?"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"पिन अभी सेट अप नहीं करना चाहते?"</string>
     <string name="lock_screen_pin_skip_face_title" msgid="8810770395309512358">"पिन और फ़ेस का सेट अप स्किप करें?"</string>
     <string name="lock_screen_pin_skip_fingerprint_title" msgid="371214283158750976">"क्या अभी आपको पिन और फ़िंगरप्रिंट का सेट अप नहीं करना है?"</string>
@@ -1470,7 +1470,7 @@
     <string name="meid_multi_sim" msgid="1460689549266621286">"MEID (<xliff:g id="MEID_SLOT_ID">%1$d</xliff:g> सिम स्लॉट)"</string>
     <string name="meid_multi_sim_primary" msgid="8921262417580407201">"MEID (<xliff:g id="MEID_SLOT_ID_PRIMARY">%1$d</xliff:g> सिम स्लॉट) (मुख्य)"</string>
     <string name="scanning_status_text_on" msgid="3846571210578042940">"चालू है"</string>
-    <string name="scanning_status_text_off" msgid="4002352668313705132">"बंद"</string>
+    <string name="scanning_status_text_off" msgid="4002352668313705132">"बंद है"</string>
     <string name="status_meid_number" msgid="6040380838489162650">"MEID"</string>
     <string name="status_icc_id" msgid="7995690631650006970">"ICCID"</string>
     <string name="status_data_network_type" msgid="3689772955330665876">"मोबाइल में डेटा के लिए इस्तेमाल होने वाले नेटवर्क का टाइप"</string>
@@ -2083,10 +2083,10 @@
     <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"सफ़ेद"</string>
     <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"काला"</string>
     <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"कोई नहीं"</string>
-    <string name="trackpad_touch_gesture" msgid="8641725062131922497">"टचपैड पर हाथ के जेस्चर जानें"</string>
+    <string name="trackpad_touch_gesture" msgid="8641725062131922497">"टचपैड से जुड़े जेस्चर जानें"</string>
     <string name="keywords_touchpad" msgid="8159846254066666032">"ट्रैकपैड, ट्रैक पैड, माउस, कर्सर, स्क्रोल, स्वाइप, राइट क्लिक, क्लिक, पॉइंटर"</string>
     <string name="keywords_trackpad_bottom_right_tap" msgid="1285062446073929305">"राइट क्लिक, टैप"</string>
-    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"बीच में क्लिक करें"</string>
+    <string name="three_finger_tap_middle_click" msgid="5274906692591143158">"बीच में क्लिक"</string>
     <string name="three_finger_tap_launch_gemini" msgid="4030401656711588982">"Assistant को लॉन्च करें"</string>
     <string name="three_finger_tap_go_home" msgid="6526301745535089812">"होम स्क्रीन पर जाएं"</string>
     <string name="three_finger_tap_go_back" msgid="2898205524575684271">"वापस जाएं"</string>
@@ -2192,7 +2192,7 @@
     <string name="general_category_title" msgid="6298579528716834157">"सामान्य"</string>
     <string name="display_category_title" msgid="6638191682294461408">"डिसप्ले"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"रंग और मोशन"</string>
-    <string name="accessibility_pointer_and_touchpad_title" msgid="5703454643194245909">"कर्सर और टचपैड का ऐक्सेस"</string>
+    <string name="accessibility_pointer_and_touchpad_title" msgid="5703454643194245909">"कर्सर और टचपैड से जुड़ी सुलभता सुविधाएं"</string>
     <string name="accessibility_pointer_and_touchpad_summary" msgid="8588221231953604340">"साइज़, कलर, टाइप"</string>
     <string name="accessibility_pointer_color_customization_title" msgid="2841888132681075999">"कर्सर का कलर"</string>
     <string name="accessibility_pointer_title" msgid="7427650233669997010">"कर्सर"</string>
@@ -3415,7 +3415,7 @@
     <string name="keywords_device_feedback" msgid="5489930491636300027">"गड़बड़ी"</string>
     <string name="keywords_ambient_display_screen" msgid="661492302323274647">"हमेशा चालू स्क्रीन, लॉक स्क्रीन डिसप्ले"</string>
     <string name="keywords_lock_screen_notif" msgid="6363144436467429932">"लॉक स्क्रीन सूचना, सूचनाएं"</string>
-    <string name="keywords_face_settings" msgid="1360447094486865058">"चेहरा"</string>
+    <string name="keywords_face_settings" msgid="1360447094486865058">"फ़ेस"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"फ़िंगरप्रिंट, फ़िंगरप्रिंट जोड़ें"</string>
     <string name="keywords_biometric_settings" msgid="2173605297939326549">"फ़ेस अनलॉक, फ़िंगरप्रिंट, फ़िंगरप्रिंट जोड़ना"</string>
     <string name="keywords_active_unlock_settings" msgid="4511320720304388889">"स्मार्टवॉच से फ़ोन अनलॉक करने की सुविधा, स्मार्टवॉच से फ़ोन अनलॉक करने की सुविधा को जोड़ें"</string>
@@ -4446,7 +4446,7 @@
     <string name="suggestion_additional_fingerprints" msgid="4726777300101156208">"और फ़िंगरप्रिंट जोड़ें"</string>
     <string name="suggestion_additional_fingerprints_summary" msgid="2825364645039666674">"किसी दूसरी उंगली से अनलॉक करें"</string>
     <string name="battery_saver_on_summary" msgid="4605146593966255848">"चालू है"</string>
-    <string name="battery_saver_off_scheduled_summary" msgid="2193875981740829819">"<xliff:g id="BATTERY_PERCENTAGE">%1$s</xliff:g> बैटरी होने पर बैटरी सेवर चालू हो जाएगा"</string>
+    <string name="battery_saver_off_scheduled_summary" msgid="2193875981740829819">"<xliff:g id="BATTERY_PERCENTAGE">%1$s</xliff:g> बैटरी बचने पर बैटरी सेवर चालू हो जाएगा"</string>
     <string name="battery_saver_off_summary" msgid="4411561435493109261">"बंद है"</string>
     <string name="app_battery_usage_title" msgid="346558380609793334">"ऐप्लिकेशन के इस्तेमाल में होने वाला बैटरी खर्च"</string>
     <string name="app_battery_usage_summary" msgid="6349965904306339539">"ऐप्लिकेशन के इस्तेमाल के लिए बैटरी खर्च सेट करें"</string>
@@ -4829,7 +4829,7 @@
     <string name="change_nfc_tag_apps_detail_summary" msgid="3338220223868942195">"इस ऐप्लिकेशन को, एनएफ़सी टैग के स्कैन होने पर लॉन्च होने की अनुमति दें.\nअगर आपने यह अनुमति दी है, तो टैग का पता चलने पर यह ऐप्लिकेशन एक विकल्प के तौर पर उपलब्ध होगा."</string>
     <string name="media_output_title" msgid="8283629315159510680">"मीडिया इस पर चलाएं"</string>
     <string name="media_output_label_title" msgid="4139048973886819148">"<xliff:g id="LABEL">%s</xliff:g> इस पर चलाएं"</string>
-    <string name="media_output_title_without_playing" msgid="3339321669132875821">"ऑडियो इस पर चलेगा"</string>
+    <string name="media_output_title_without_playing" msgid="3339321669132875821">"ऑडियो चलेगा"</string>
     <string name="media_output_default_summary" msgid="4200343059396412376">"इस डिवाइस पर"</string>
     <string name="media_output_audio_sharing" msgid="8169294522817470115">"ऑडियो शेयर किया जा रहा है"</string>
     <string name="media_out_summary_ongoing_call_state" msgid="475188726850090363">"कॉल के दौरान उपलब्ध नहीं है"</string>
@@ -5610,14 +5610,15 @@
     <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="keywords_contacts_storage" msgid="9061213057165337893">"संपर्क, स्टोरेज, खाता"</string>
-    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"संपर्क स्टोरेज"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"संपर्क का स्टोरेज"</string>
     <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_set_default_account_error_message" msgid="849847649756411393">"डिफ़ॉल्ट खाता सेट करने में गड़बड़ी हुई"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"कोई डिफ़ॉल्ट खाता सेट नहीं किया गया है"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"सिर्फ़ डिवाइस का इस्तेमाल करें"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"डिवाइस और %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"सिंक करने के लिए कोई खाता जोड़ें"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"संपर्कों को कहां सेव करना है"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"सर्कल बनाकर ढूंढें"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index d01c8fb..5aab478 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -509,7 +509,7 @@
     <string name="security_settings_remoteauth_settings_description" msgid="2758239650119457964">"Pomoću sata možete otključati ovaj telefon kad prijeđete prstom prema gore po zaključanom zaslonu ili kad dodirnete obavijest"</string>
     <string name="security_settings_remoteauth_settings_info_footer" msgid="795894033901478120">"Da biste upotrebljavali otključavanje satom, vaš sat mora biti otključan, na vašoj ruci, unutar dometa i povezan s ovim telefonom. Ako je veza prekinuta, morat ćete otključati telefon da biste mogli upotrebljavati otključavanje satom.\n\nImajte na umu:\nne možete imati nekoliko povezanih satova istovremeno. Da biste dodali neki drugi sat, najprije uklonite trenutačni."</string>
     <string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Saznajte više o otključavanju satom"</string>
-    <string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Dodaj sat"</string>
+    <string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Dodajte sat"</string>
     <string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Uklonite sat"</string>
     <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Otključavanje licem i otiskom prsta"</string>
     <string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Otključavanje licem i otiskom prsta za posao"</string>
@@ -2470,8 +2470,7 @@
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"Triput dodirnite zaslon"</string>
     <string name="accessibility_shortcut_edit_screen_title" msgid="4494142067760961499">"Uređivanje prečaca pristupačnosti"</string>
     <string name="accessibility_shortcut_edit_screen_prompt" msgid="5966054283114856682">"Odaberite prečac za značajku %1$s"</string>
-    <!-- no translation found for accessibility_shortcut_unassigned_setting_unavailable_summary (993486098872935043) -->
-    <skip />
+    <string name="accessibility_shortcut_unassigned_setting_unavailable_summary" msgid="993486098872935043">"Da biste to upotrebljavali, uključite prečac %1$s na stranici značajke pristupačnosti"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"Nastavi"</string>
     <string name="accessibility_hearingaid_title" msgid="1263619711863375614">"Slušna pomagala"</string>
     <string name="accessibility_hearingaid_intro" msgid="6686620444104350629">"Postavite slušna pomagala s protokolom ASHA i LE Audio, umjetne pužnice i druge uređaje za pojačavanje zvuka"</string>
@@ -3099,7 +3098,7 @@
     <string name="vpn_cant_connect_message" msgid="2139148820719163694">"Ova aplikacija ne podržava uvijek uključeni VPN"</string>
     <string name="vpn_title" msgid="3068868814145870274">"VPN"</string>
     <string name="vpn_create" msgid="7546073242936894638">"Dodavanje VPN profila"</string>
-    <string name="vpn_menu_edit" msgid="5100387853773792379">"Uredi profil"</string>
+    <string name="vpn_menu_edit" msgid="5100387853773792379">"Uredite profil"</string>
     <string name="vpn_menu_delete" msgid="4455966182219039928">"Izbriši profil"</string>
     <string name="vpn_menu_lockdown" msgid="5284041663859541007">"Uvijek uključena VPN mreža"</string>
     <string name="vpn_no_vpns_added" msgid="7387080769821533728">"Nije dodan nijedan VPN"</string>
@@ -5618,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Pogreška pri postavljanju zadanog računa"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Nema zadane postavke"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Samo uređaj"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Uređaj i %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Dodajte račun da biste započeli"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Gdje spremiti kontakte"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Zaokružite i potražite"</string>
@@ -5629,8 +5629,8 @@
     <string name="device_supervision_switch_title" msgid="3203958797412413373">"Koristi nadzor uređaja"</string>
     <string name="device_supervision_switch_no_pin_summary" msgid="8294396978464347129">"Postavite PIN da biste započeli"</string>
     <string name="keywords_supervision_settings" msgid="2580555201483955376">"nadzor, roditeljski nadzor, roditeljske kontrole"</string>
-    <!-- no translation found for supervision_pin_management_preference_title (961680798581006465) -->
-    <skip />
-    <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
+    <string name="supervision_pin_management_preference_title" msgid="961680798581006465">"Upravljajte PIN-om"</string>
+    <string name="supervision_pin_management_preference_summary_add" msgid="3244161328612671896">"Dodajte način oporavka PIN-a"</string>
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
     <skip />
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 0f59f5a..219aba0 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -1787,7 +1787,7 @@
     <string name="lockpassword_confirm_your_pattern_header_frp" msgid="5641858015891896427">"Minta ellenőrzése"</string>
     <string name="lockpassword_confirm_your_pin_header_frp" msgid="8285647793164729982">"PIN-kód ellenőrzése"</string>
     <string name="lockpassword_confirm_your_password_header_frp" msgid="7932240547542564033">"Jelszó ellenőrzése"</string>
-    <string name="lockpassword_remote_validation_header" msgid="4992647285784962073">"Kilét igazolása"</string>
+    <string name="lockpassword_remote_validation_header" msgid="4992647285784962073">"Igazolja magát"</string>
     <string name="lockpassword_remote_validation_pattern_details" msgid="4655537780358707983">"A Google-fiókok, beállítások és egyebek átviteléhez adja meg a másik eszköz mintáját. Mintája titkosítva van."</string>
     <string name="lockpassword_remote_validation_pin_details" msgid="2373654227583206297">"A Google-fiókok, beállítások és egyebek átviteléhez adja meg a másik eszköz PIN-kódját. PIN-kódja titkosítva van."</string>
     <string name="lockpassword_remote_validation_password_details" msgid="3482328925925888340">"A Google-fiókok, beállítások és egyebek átviteléhez adja meg a másik eszköz jelszavát. Jelszava titkosítva van."</string>
@@ -2067,7 +2067,7 @@
     <string name="trackpad_reverse_scrolling_title" msgid="422877284529360866">"Fordított görgetés"</string>
     <string name="trackpad_reverse_scrolling_summary" msgid="6048648562887499036">"Lefelé görgetéskor a tartalom felfelé halad"</string>
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"Kattintás a jobb alsó sarokban"</string>
-    <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"Több beállítás: kattintson az érintőpad jobb alsó sarkában"</string>
+    <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"További opciók: kattintson az érintőpad jobb alsó sarkában"</string>
     <string name="trackpad_pointer_speed" msgid="5672221910698079303">"Kurzor sebessége"</string>
     <string name="three_finger_tap_preference_title" msgid="2114347152933865780">"A három ujjal koppintás személyre szabása"</string>
     <string name="touchpad_acceleration_title" msgid="176627555191021888">"Érintőpad gyorsítása"</string>
@@ -5617,8 +5617,9 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Hiba történt az alapértelmezett fiók beállításakor"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Nincs alapértelmezett beállítás"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Csak a készüléken"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Eszköz és %1$s"</string>
-    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"A kezdéshez adjon hozzá egy fiókot."</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"A kezdéshez adjon hozzá egy fiókot"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"A névjegyek mentésének helye"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Bekarikázással keresés"</string>
     <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Tartsa lenyomva a Kezdőképernyő gombot vagy a navigációs fogópontot a képernyőn lévő tartalommal való kereséshez."</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 4ce7d7d..b088097 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Չհաջողվեց հաշիվը սահմանել որպես կանխադրված"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Կանխադրված հաշիվ չկա"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Միայն սարքում"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Սարք և %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Սկսելու համար ավելացրեք հաշիվ"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Որտեղ պահել կոնտակտները"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Շրջագծել որոնելու համար"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index e64fd76..c8379af 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Terjadi error saat menetapkan akun default"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Tidak ada default yang disetel"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Perangkat saja"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Perangkat dan %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Tambahkan akun untuk memulai"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Tempat untuk menyimpan kontak"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Lingkari untuk Menelusuri"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index c7bb561..25f1b5a 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Villa kom upp við að stilla sjálfgefinn reikning"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Ekkert sjálfgildi stillt"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Aðeins tæki"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Tæki og %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Bættu reikningi við til að hefjast handa"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Hvar viltu vista tengiliði?"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Circle to Search"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index f049161..bcdaf90 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -2470,8 +2470,7 @@
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"Tocca tre volte lo schermo"</string>
     <string name="accessibility_shortcut_edit_screen_title" msgid="4494142067760961499">"Modificare le scorciatoie di accessibilità"</string>
     <string name="accessibility_shortcut_edit_screen_prompt" msgid="5966054283114856682">"Scegli la scorciatoia per %1$s"</string>
-    <!-- no translation found for accessibility_shortcut_unassigned_setting_unavailable_summary (993486098872935043) -->
-    <skip />
+    <string name="accessibility_shortcut_unassigned_setting_unavailable_summary" msgid="993486098872935043">"Per utilizzare questa funzionalità, attiva la scorciatoia di %1$s nella pagina di una funzione di accessibilità"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"Continua"</string>
     <string name="accessibility_hearingaid_title" msgid="1263619711863375614">"Protesi uditive"</string>
     <string name="accessibility_hearingaid_intro" msgid="6686620444104350629">"Configura e gestisci apparecchi acustici, impianti cocleari e altri dispositivi di amplificazione ASHA ed LE Audio"</string>
@@ -3716,7 +3715,7 @@
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Rimuovi automaticamente dalla schermata di blocco le notifiche già visualizzate"</string>
     <string name="lock_screen_notifs_show_full_list" msgid="6767009263807771108">"Elenco completo"</string>
     <string name="lock_screen_notifs_show_compact" msgid="1944867696357706016">"Visualizzazione compatta"</string>
-    <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Notifiche sulla schermata di blocco"</string>
+    <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Notifiche su schermata di blocco"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Mostra conversazioni, notifiche predefinite e silenziose"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Mostra conversazioni, notifiche predefinite e silenziose"</string>
     <string name="lock_screen_notifs_show_alerting" msgid="6584682657382684566">"Nascondi conversazioni e notifiche silenziose"</string>
@@ -5617,7 +5616,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Errore durante l\'impostazione dell\'account predefinito"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Nessun account impostato come predefinito"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Solo dispositivo"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Dispositivo e %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Aggiungi un account per iniziare"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Dove salvare i contatti"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Cerchia e Cerca"</string>
@@ -5628,8 +5628,8 @@
     <string name="device_supervision_switch_title" msgid="3203958797412413373">"Usa la supervisione del dispositivo"</string>
     <string name="device_supervision_switch_no_pin_summary" msgid="8294396978464347129">"Configura il PIN per iniziare"</string>
     <string name="keywords_supervision_settings" msgid="2580555201483955376">"supervisione, Supervisione dei genitori, Controllo genitori"</string>
-    <!-- no translation found for supervision_pin_management_preference_title (961680798581006465) -->
-    <skip />
-    <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
+    <string name="supervision_pin_management_preference_title" msgid="961680798581006465">"Gestisci PIN"</string>
+    <string name="supervision_pin_management_preference_summary_add" msgid="3244161328612671896">"Aggiungi un metodo di recupero del PIN"</string>
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
     <skip />
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 2472fd5..40d260d 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -5618,7 +5618,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"אירעה שגיאה בהגדרה של חשבון ברירת המחדל"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"לא הוגדרה ברירת מחדל"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"מכשיר בלבד"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"‏במכשיר וב-%1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"כדי להתחיל, צריך להוסיף חשבון"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"איפה לשמור אנשי קשר"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"מקיפים ומחפשים"</string>
@@ -5633,4 +5634,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 6858ef1..4582ab3 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -2470,8 +2470,7 @@
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"画面をトリプルタップ"</string>
     <string name="accessibility_shortcut_edit_screen_title" msgid="4494142067760961499">"ユーザー補助のショートカットの編集"</string>
     <string name="accessibility_shortcut_edit_screen_prompt" msgid="5966054283114856682">"%1$s のショートカットの選択"</string>
-    <!-- no translation found for accessibility_shortcut_unassigned_setting_unavailable_summary (993486098872935043) -->
-    <skip />
+    <string name="accessibility_shortcut_unassigned_setting_unavailable_summary" msgid="993486098872935043">"使用するには、ユーザー補助機能のページで %1$s のショートカットを有効にしてください"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"続行"</string>
     <string name="accessibility_hearingaid_title" msgid="1263619711863375614">"補聴器"</string>
     <string name="accessibility_hearingaid_intro" msgid="6686620444104350629">"ASHA や LE Audio に対応した補聴器や人工内耳などの聴覚補助器を設定、管理できます"</string>
@@ -5617,7 +5616,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"デフォルトのアカウントの設定中にエラーが発生しました"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"デフォルトは設定されていません"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"デバイスのみ"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"デバイスと %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"開始するにはアカウントを追加してください"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"連絡先の保存先"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"かこって検索"</string>
@@ -5628,8 +5628,8 @@
     <string name="device_supervision_switch_title" msgid="3203958797412413373">"デバイスの管理機能を使用する"</string>
     <string name="device_supervision_switch_no_pin_summary" msgid="8294396978464347129">"最初に PIN を設定してください"</string>
     <string name="keywords_supervision_settings" msgid="2580555201483955376">"管理機能, 保護者向け管理ツール, 保護者による使用制限"</string>
-    <!-- no translation found for supervision_pin_management_preference_title (961680798581006465) -->
-    <skip />
-    <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
+    <string name="supervision_pin_management_preference_title" msgid="961680798581006465">"PIN の管理"</string>
+    <string name="supervision_pin_management_preference_summary_add" msgid="3244161328612671896">"PIN の復元方法を追加します"</string>
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
     <skip />
 </resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 8a80759..2115975 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"ნაგულისხმევი ანგარიშის დაყენებისას წარმოიშვა შეცდომა"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"ნაგულისხმევი ანგარიში დაყენებული არ არის"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"მხოლოდ მოწყობილობა"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"მოწყობილობა და %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"დასაწყებად დაამატეთ ანგარიში"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"სად მოხდეს კონტაქტების შენახვა"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"ძიება წრის მოხაზვით"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 5582c30..4192900 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Әдепкі аккаунт орнату кезінде қате шықты."</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Әдепкі аккаунт таңдалмаған."</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Құрылғы ғана"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Құрылғы және %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Бастау үшін аккаунт қосыңыз."</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Контактілерді сақтау орны"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Қоршау арқылы іздеу"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 81fb260..2e1ee2c 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -2359,7 +2359,7 @@
     <string name="accessibility_button_intro" msgid="2601976470525277903">"ប្រើប៊ូតុង​ភាពងាយស្រួល។ មិនអាចប្រើចលនានេះតាមរយៈការរុករកដោយប្រើ​​ប៊ូតុង 3 បានទេ។"</string>
     <string name="accessibility_button_summary" msgid="8510939012631455831">"ចូលប្រើមុខងារ​ភាពងាយស្រួល​បានយ៉ាងរហ័ស"</string>
     <string name="accessibility_button_gesture_description" msgid="1141723096904904336">"&lt;b&gt;ដើម្បីចាប់ផ្ដើម&lt;/b&gt;&lt;br/&gt; {0,number,integer}. ចូលទៅកាន់ការកំណត់ភាពងាយស្រួល&lt;br/&gt; {1,number,integer}. ជ្រើសរើសមុខងារ និងចុចផ្លូវកាត់&lt;br/&gt; {2,number,integer}. ជ្រើសរើសថាតើអ្នកចង់ប្រើប៊ូតុង ឬចលនា ដើម្បីចូលប្រើប្រាស់មុខងារនេះ&lt;br/&gt;"</string>
-    <string name="accessibility_button_description" msgid="7669538706120092399">"&lt;b&gt;ដើម្បីចាប់ផ្ដើម&lt;/b&gt;&lt;br/&gt; {0,number,integer}។ ចូលទៅកាន់ការកំណត់ភាពងាយស្រួល&lt;br/&gt; {1,number,integer}។ ជ្រើសរើសមុខងារ និងចុចផ្លូវកាត់&lt;br/&gt; {2,number,integer}។ ជ្រើសរើសប៊ូតុង ដើម្បីចូលប្រើប្រាស់មុខងារនេះ&lt;br/&gt;"</string>
+    <string name="accessibility_button_description" msgid="7669538706120092399">"&lt;b&gt;ដើម្បីចាប់ផ្ដើម&lt;/b&gt;&lt;br/&gt; {0,number,integer}. ចូលទៅកាន់ការកំណត់ភាពងាយស្រួល&lt;br/&gt; {1,number,integer}. ជ្រើសរើសមុខងារ និងចុចផ្លូវកាត់&lt;br/&gt; {2,number,integer}. ជ្រើសរើសប៊ូតុង ដើម្បីចូលប្រើប្រាស់មុខងារនេះ&lt;br/&gt;"</string>
     <string name="accessibility_button_or_gesture_title" msgid="3510075963401163529">"ប្រើប៊ូតុង ឬចលនា"</string>
     <string name="accessibility_button_location_title" msgid="7182107846092304942">"ទីតាំង"</string>
     <string name="accessibility_button_size_title" msgid="5785110470538960881">"ទំហំ"</string>
@@ -2470,8 +2470,7 @@
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"ចុចអេក្រង់​បីដង"</string>
     <string name="accessibility_shortcut_edit_screen_title" msgid="4494142067760961499">"កែផ្លូវកាត់ភាពងាយស្រួល"</string>
     <string name="accessibility_shortcut_edit_screen_prompt" msgid="5966054283114856682">"ជ្រើសរើសផ្លូវកាត់របស់អ្នកសម្រាប់ %1$s"</string>
-    <!-- no translation found for accessibility_shortcut_unassigned_setting_unavailable_summary (993486098872935043) -->
-    <skip />
+    <string name="accessibility_shortcut_unassigned_setting_unavailable_summary" msgid="993486098872935043">"ដើម្បីប្រើប្រាស់មុខងារនេះ សូមបើកផ្លូវកាត់ %1$s នៅលើទំព័ររបស់មុខងារភាពងាយស្រួល"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"បន្ត"</string>
     <string name="accessibility_hearingaid_title" msgid="1263619711863375614">"ឧបករណ៍ជំនួយការស្ដាប់"</string>
     <string name="accessibility_hearingaid_intro" msgid="6686620444104350629">"រៀបចំ និងគ្រប់គ្រងឧបករណ៍​ជំនួយការ​ស្ដាប់ ASHA និង LE Audio, ឧបករណ៍​អេឡិចត្រូនិក​ក្នុងខ្លួនមនុស្ស​សម្រាប់ជំនួយការស្ដាប់ និងឧបករណ៍បង្កើនសំឡេង"</string>
@@ -5610,15 +5609,16 @@
     <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="keywords_contacts_storage" msgid="9061213057165337893">"contacts, ទំហំ​ផ្ទុក, គណនី"</string>
-    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"ទំហំផ្ទុក Contacts"</string>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"ទំហំផ្ទុកទំនាក់ទំនង"</string>
     <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_set_default_account_error_message" msgid="849847649756411393">"មានបញ្ហាក្នុងការកំណត់គណនី​លំនាំដើម"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"មិន​បាន​កំណត់​លំនាំដើម"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"សម្រាប់តែឧបករណ៍"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"ឧបករណ៍ និង %1$s"</string>
-    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"សូមបញ្ចូល​គណនី ដើម្បីចាប់ផ្ដើម"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
+    <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"បញ្ចូល​គណនី ដើម្បីចាប់ផ្ដើម"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"កន្លែងសម្រាប់រក្សាទុកទំនាក់ទំនង"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"គូររង្វង់ដើម្បីស្វែងរក"</string>
     <string name="search_gesture_feature_summary" msgid="1793056495030564014">"ចុចប៊ូតុងទំព័រ​ដើម ឬដងរុករកឱ្យជាប់ ដើម្បីស្វែងរកដោយប្រើខ្លឹមសារនៅលើអេក្រង់របស់អ្នក។"</string>
@@ -5628,8 +5628,8 @@
     <string name="device_supervision_switch_title" msgid="3203958797412413373">"ប្រើការគ្រប់គ្រងឧបករណ៍"</string>
     <string name="device_supervision_switch_no_pin_summary" msgid="8294396978464347129">"រៀបចំកូដ PIN ដើម្បីចាប់ផ្ដើម"</string>
     <string name="keywords_supervision_settings" msgid="2580555201483955376">"ការគ្រប់គ្រង, ការគ្រប់គ្រងរបស់មាតាបិតា, ការគ្រប់គ្រងដោយមាតាបិតា"</string>
-    <!-- no translation found for supervision_pin_management_preference_title (961680798581006465) -->
-    <skip />
-    <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
+    <string name="supervision_pin_management_preference_title" msgid="961680798581006465">"គ្រប់គ្រងកូដ PIN"</string>
+    <string name="supervision_pin_management_preference_summary_add" msgid="3244161328612671896">"បញ្ចូលវិធីស្ដារកូដ PIN ឡើងវិញ"</string>
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
     <skip />
 </resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index f83db0d..5d2797c 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -2470,8 +2470,7 @@
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"ಸ್ಕ್ರೀನ್ ಮೇಲೆ ಮೂರು ಬಾರಿ ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
     <string name="accessibility_shortcut_edit_screen_title" msgid="4494142067760961499">"ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ ಶಾರ್ಟ್‌ಕಟ್‌ಗಳನ್ನು ಎಡಿಟ್ ಮಾಡಿ"</string>
     <string name="accessibility_shortcut_edit_screen_prompt" msgid="5966054283114856682">"%1$s ಗಾಗಿ ನಿಮ್ಮ ಶಾರ್ಟ್‌ಕಟ್ ಆಯ್ಕೆಮಾಡಿ"</string>
-    <!-- no translation found for accessibility_shortcut_unassigned_setting_unavailable_summary (993486098872935043) -->
-    <skip />
+    <string name="accessibility_shortcut_unassigned_setting_unavailable_summary" msgid="993486098872935043">"ಇದನ್ನು ಬಳಸಲು, ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ ಫೀಚರ್‌ಗಳು ಪುಟದಲ್ಲಿ %1$s ಶಾರ್ಟ್‌ಕಟ್ ಅನ್ನು ಆನ್ ಮಾಡಿ."</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"ಮುಂದುವರಿಸಿ"</string>
     <string name="accessibility_hearingaid_title" msgid="1263619711863375614">"ಶ್ರವಣ ಸಾಧನಗಳು"</string>
     <string name="accessibility_hearingaid_intro" msgid="6686620444104350629">"ASHA ಮತ್ತು LE ಆಡಿಯೋ ಶ್ರವಣ ಸಾಧನಗಳು, ಕಾಕ್ಲಿಯರ್ ಇಂಪ್ಲಾಂಟ್‌ಗಳು ಮತ್ತು ಇತರ ಆಂಪ್ಲಿಫಿಕೇಶನ್ ಸಾಧನಗಳನ್ನು ಸೆಟಪ್ ಮಾಡಿ ಮತ್ತು ನಿರ್ವಹಿಸಿ"</string>
@@ -5617,7 +5616,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"ಡೀಫಾಲ್ಟ್ ಖಾತೆಯನ್ನು ಸೆಟ್ ಮಾಡುವಾಗ ದೋಷ ಎದುರಾಗಿದೆ"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"ಡೀಫಾಲ್ಟ್ ಆಗಿ ಯಾವುದನ್ನೂ ಸೆಟ್ ಮಾಡಿಲ್ಲ"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"ಸಾಧನ ಮಾತ್ರ"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"ಸಾಧನ ಮತ್ತು %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"ಪ್ರಾರಂಭಿಸಲು ಒಂದು ಖಾತೆಯನ್ನು ಸೇರಿಸಿ"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"ಸಂಪರ್ಕಗಳನ್ನು ಎಲ್ಲಿ ಸೇವ್ ಮಾಡಬೇಕು"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"ಹುಡುಕಲು ಒಂದು ಸರ್ಕಲ್ ರಚಿಸಿ"</string>
@@ -5628,8 +5628,8 @@
     <string name="device_supervision_switch_title" msgid="3203958797412413373">"ಸಾಧನದ ಮೇಲ್ವಿಚಾರಣೆಯನ್ನು ಬಳಸಿ"</string>
     <string name="device_supervision_switch_no_pin_summary" msgid="8294396978464347129">"ಪ್ರಾರಂಭಿಸಲು ಪಿನ್ ಸೆಟಪ್ ಮಾಡಿ"</string>
     <string name="keywords_supervision_settings" msgid="2580555201483955376">"ಮೇಲ್ವಿಚಾರಣೆ, ಪೋಷಕರ ಮೇಲ್ವಿಚಾರಣೆ, ಪೋಷಕ ನಿಯಂತ್ರಣಗಳು"</string>
-    <!-- no translation found for supervision_pin_management_preference_title (961680798581006465) -->
-    <skip />
-    <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
+    <string name="supervision_pin_management_preference_title" msgid="961680798581006465">"ಪಿನ್ ಅನ್ನು ನಿರ್ವಹಿಸಿ"</string>
+    <string name="supervision_pin_management_preference_summary_add" msgid="3244161328612671896">"ಪಿನ್ ರಿಕವರಿ ವಿಧಾನವನ್ನು ಸೇರಿಸಿ"</string>
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
     <skip />
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 6850a21..c5f119f 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"기본 계정을 설정하는 중에 오류가 발생했습니다."</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"기본 설정 없음"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"기기만"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"기기 및 %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"계정을 추가하여 시작하세요."</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"연락처 저장 위치"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"서클 투 서치"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 4b12b2d..dc181b8 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -4132,7 +4132,7 @@
     <string name="storage_summary_format" msgid="5721782272185284276">"Канчасы колдонулду: <xliff:g id="SIZE">%1$s</xliff:g> (<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>)"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"ички сактагыч"</string>
     <string name="storage_type_external" msgid="125078274000280821">"тышкы сактагыч"</string>
-    <string name="data_summary_format" msgid="8802057788950096650">"<xliff:g id="DATE">%2$s</xliff:g> бери <xliff:g id="SIZE">%1$s</xliff:g> клднлгн"</string>
+    <string name="data_summary_format" msgid="8802057788950096650">"<xliff:g id="DATE">%2$s</xliff:g> бери <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="storage_used" msgid="2591194906751432725">"Колдонулган эстутум"</string>
     <string name="change" msgid="273206077375322595">"Өзгөртүү"</string>
     <string name="change_storage" msgid="8773820275624113401">"Сактагычты өзгөртүү"</string>
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Демейки аккаунтту орнотуп жатканда ката кетти"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Демейки аккаунт орнотулган жок"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Түзмөктө гана"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Түзмөк жана %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Баштоо үчүн аккаунт кошуңуз"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Байланыштарды кайда сактоо керек"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Тегеректеп издөө"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 57b5bb5..72cf76e 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"ການຕັ້ງຄ່າບັນຊີເລີ່ມຕົ້ນຜິດພາດ"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"ບໍ່ມີການຕັ້ງຄ່າເລີ່ມຕົ້ນ"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"ອຸປະກອນເທົ່ານັ້ນ"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"ອຸປະກອນ ແລະ %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"ເພີ່ມບັນຊີເພື່ອເລີ່ມຕົ້ນ"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"ບ່ອນທີ່ບັນທຶກລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"ແຕ້ມວົງມົນເພື່ອຊອກຫາ"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 273be5b..cf00a0f 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -2470,8 +2470,7 @@
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"Triskart paliesti ekraną"</string>
     <string name="accessibility_shortcut_edit_screen_title" msgid="4494142067760961499">"Pritaikomumo šaukinių redagavimas"</string>
     <string name="accessibility_shortcut_edit_screen_prompt" msgid="5966054283114856682">"Pasirinkite „%1$s“ spartųjį klavišą"</string>
-    <!-- no translation found for accessibility_shortcut_unassigned_setting_unavailable_summary (993486098872935043) -->
-    <skip />
+    <string name="accessibility_shortcut_unassigned_setting_unavailable_summary" msgid="993486098872935043">"Jei norite naudoti šią funkciją, įjunkite %1$s spartųjį klavišą pritaikymo neįgaliesiems funkcijų puslapyje"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"Tęsti"</string>
     <string name="accessibility_hearingaid_title" msgid="1263619711863375614">"Klausos įrenginiai"</string>
     <string name="accessibility_hearingaid_intro" msgid="6686620444104350629">"Nustatykite ir tvarkykite ASHA ir „LE Audio“ klausos aparatus, vidinės ausies implantus ir kitus garso stiprinimo įrenginius"</string>
@@ -5619,7 +5618,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Nustatant numatytąją paskyrą įvyko klaida"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Numatytoji paskyra nenustatyta"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Tik įrenginys"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Įrenginys ir %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Jei norite pradėti, pridėkite paskyrą"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Kur išsaugoti kontaktus"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Paieška apibrėžiant"</string>
@@ -5630,8 +5630,8 @@
     <string name="device_supervision_switch_title" msgid="3203958797412413373">"Naudoti įrenginio priežiūrą"</string>
     <string name="device_supervision_switch_no_pin_summary" msgid="8294396978464347129">"Nustatyti PIN kodą, kad būtų galima pradėti"</string>
     <string name="keywords_supervision_settings" msgid="2580555201483955376">"priežiūra, tėvų priežiūra, tėvų kontrolė"</string>
-    <!-- no translation found for supervision_pin_management_preference_title (961680798581006465) -->
-    <skip />
-    <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
+    <string name="supervision_pin_management_preference_title" msgid="961680798581006465">"PIN kodo tvarkymas"</string>
+    <string name="supervision_pin_management_preference_summary_add" msgid="3244161328612671896">"Pridėkite PIN kodo atkūrimo metodą"</string>
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
     <skip />
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 10054c4..fda4666 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -5618,7 +5618,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Iestatot noklusējuma kontu, radās kļūda."</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Nav iestatīts noklusējuma konts"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Tikai ierīcē"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Ierīce un %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Lai sāktu darbu, pievienojiet kontu."</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Kur saglabāt kontaktpersonas"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Apvilkt un meklēt"</string>
@@ -5633,4 +5634,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 6559d5c..3867de1 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -1455,7 +1455,7 @@
     <string name="battery_info" msgid="7873528123969546728">"Информации за батеријата"</string>
     <string name="device_info_not_available" msgid="4804474466616712326">"Не е достапна"</string>
     <string name="storage_settings" msgid="7472188817781592677">"Простор"</string>
-    <string name="storage_settings_for_app" msgid="229425418984637483">"Капацитет и кеш"</string>
+    <string name="storage_settings_for_app" msgid="229425418984637483">"Простор и кеш"</string>
     <string name="storage_settings_title" msgid="486118156723194815">"Подесување на меморија"</string>
     <string name="status_eid" msgid="3588471107671992684">"E​ID"</string>
     <string name="eid_multi_sim" msgid="6551259348909791790">"E​ID (отвор за SIM <xliff:g id="EID_SLOT_ID">%1$d</xliff:g>)"</string>
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Грешка при поставувањето на стандардната сметка"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Нема поставено стандардна сметка"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Само уред"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Уред и %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Додајте сметка за да започнете"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Каде да се зачувуваат контактите"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Пребарување со заокружување"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index eae389b..b35e661 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -2470,8 +2470,7 @@
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"സ്ക്രീൻ മൂന്ന് തവണ ടാപ്പ് ചെയ്യുക"</string>
     <string name="accessibility_shortcut_edit_screen_title" msgid="4494142067760961499">"ഉപയോഗസഹായി കുറുക്കുവഴികൾ എഡിറ്റ് ചെയ്യുക"</string>
     <string name="accessibility_shortcut_edit_screen_prompt" msgid="5966054283114856682">"%1$s എന്നതിനുള്ള നിങ്ങളുടെ കുറുക്കുവഴി തിരഞ്ഞെടുക്കുക"</string>
-    <!-- no translation found for accessibility_shortcut_unassigned_setting_unavailable_summary (993486098872935043) -->
-    <skip />
+    <string name="accessibility_shortcut_unassigned_setting_unavailable_summary" msgid="993486098872935043">"ഇത് ഉപയോഗിക്കാൻ, ഒരു ഉപയോഗസഹായി ഫീച്ചർ പേജിൽ %1$s കുറുക്കുവഴി ഓണാക്കുക"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"തുടരുക"</string>
     <string name="accessibility_hearingaid_title" msgid="1263619711863375614">"ശ്രവണ ഉപകരണങ്ങൾ"</string>
     <string name="accessibility_hearingaid_intro" msgid="6686620444104350629">"ASHA, LE ഓഡിയോ ശ്രവണ സഹായികളും കോക്ലിയർ ഇംപ്ലാന്റുകളും മറ്റ് ആംപ്ലിഫിക്കേഷൻ ഉപകരണങ്ങളും സജ്ജീകരിച്ച് മാനേജ് ചെയ്യുക"</string>
@@ -5617,7 +5616,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"ഡിഫോൾട്ട് അക്കൗണ്ട് സജ്ജീകരിക്കുന്നതിൽ പിശക്"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"ഡിഫോൾട്ട് ഒന്നും സജ്ജീകരിച്ചിട്ടില്ല"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"ഉപകരണം മാത്രം"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"ഉപകരണത്തിലും %1$s എന്നതിലും"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"ആരംഭിക്കുന്നതിന് ഒരു അക്കൗണ്ട് ചേർക്കുക"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"കോൺടാക്റ്റുകൾ എവിടെ സംരക്ഷിക്കും"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"തിരയാൻ വട്ടം വരയ്ക്കൽ"</string>
@@ -5628,8 +5628,8 @@
     <string name="device_supervision_switch_title" msgid="3203958797412413373">"ഉപകരണ മേൽനോട്ടം ഉപയോഗിക്കുക"</string>
     <string name="device_supervision_switch_no_pin_summary" msgid="8294396978464347129">"ആരംഭിക്കാൻ പിൻ സജ്ജീകരിക്കുക"</string>
     <string name="keywords_supervision_settings" msgid="2580555201483955376">"മേൽനോട്ടം, രക്ഷാകർതൃ മേൽനോട്ടം, രക്ഷാകർതൃ നിയന്ത്രണങ്ങൾ"</string>
-    <!-- no translation found for supervision_pin_management_preference_title (961680798581006465) -->
-    <skip />
-    <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
+    <string name="supervision_pin_management_preference_title" msgid="961680798581006465">"പിൻ മാനേജ് ചെയ്യുക"</string>
+    <string name="supervision_pin_management_preference_summary_add" msgid="3244161328612671896">"പിൻ വീണ്ടെടുക്കൽ രീതി ചേർക്കുക"</string>
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
     <skip />
 </resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 8cadda3..13f12ba 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Үндсэн бүртгэлийг тохируулахад алдаа гарлаа"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Үндсэн бүртгэл тохируулаагүй"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Зөвхөн төхөөрөмж"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Төхөөрөмж, %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Эхлүүлэхийн тулд бүртгэл нэмнэ үү"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Харилцагчдыг хаана хадгалах вэ?"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Тойруулж зураад хай"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index bcc59b6..bc1e735 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"डीफॉल्ट खाते सेट करताना एरर आली"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"कोणतेही डीफॉल्ट खाते सेट केलेले नाही"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"केवळ डिव्हाइस"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"डिव्हाइस आणि %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"सुरू करण्यासाठी एखादे खाते जोडा"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"संपर्क कुठे सेव्ह करावेत"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"शोधण्यासाठी वर्तुळ करा"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 2a74f70..8ce473c 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -2470,8 +2470,7 @@
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"Ketik tiga kali pada skrin"</string>
     <string name="accessibility_shortcut_edit_screen_title" msgid="4494142067760961499">"Edit pintasan kebolehaksesan"</string>
     <string name="accessibility_shortcut_edit_screen_prompt" msgid="5966054283114856682">"Pilih pintasan anda untuk %1$s"</string>
-    <!-- no translation found for accessibility_shortcut_unassigned_setting_unavailable_summary (993486098872935043) -->
-    <skip />
+    <string name="accessibility_shortcut_unassigned_setting_unavailable_summary" msgid="993486098872935043">"Untuk menggunakan tetapan ini, hidupkan pintasan %1$s pada halaman ciri kebolehaksesan"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"Teruskan"</string>
     <string name="accessibility_hearingaid_title" msgid="1263619711863375614">"Peranti pendengaran"</string>
     <string name="accessibility_hearingaid_intro" msgid="6686620444104350629">"Sediakan dan urus alat bantu pendengaran, implan koklea dan peranti penguatan ASHA dan LE Audio yang lain"</string>
@@ -5617,7 +5616,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Ralat semasa menetapkan akaun lalai"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Tiada akaun lalai ditetapkan"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Peranti sahaja"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Peranti dan %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Tambahkan akaun untuk bermula"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Lokasi untuk menyimpan kenalan"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Bulatkan untuk Membuat Carian"</string>
@@ -5628,8 +5628,8 @@
     <string name="device_supervision_switch_title" msgid="3203958797412413373">"Gunakan pengawasan peranti"</string>
     <string name="device_supervision_switch_no_pin_summary" msgid="8294396978464347129">"Sediakan PIN untuk bermula"</string>
     <string name="keywords_supervision_settings" msgid="2580555201483955376">"pengawasan, pengawasan ibu bapa, kawalan ibu bapa"</string>
-    <!-- no translation found for supervision_pin_management_preference_title (961680798581006465) -->
-    <skip />
-    <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
+    <string name="supervision_pin_management_preference_title" msgid="961680798581006465">"Urus PIN"</string>
+    <string name="supervision_pin_management_preference_summary_add" msgid="3244161328612671896">"Tambahkan kaedah pemulihan PIN"</string>
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
     <skip />
 </resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 0f3fe2f..dfc7a69 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"မူလအကောင့်ကို သတ်မှတ်ရာတွင် အမှားရှိသည်"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"မူလအကောင့် သတ်မှတ်မထားပါ"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"စက်ပစ္စည်းသီးသန့်"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"စက်ပစ္စည်းနှင့် %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"စတင်ရန် အကောင့်ထည့်ပါ"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"အဆက်အသွယ်များ သိမ်းမည့်နေရာ"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"ရှာရန် ကွက်၍ဝိုင်းလိုက်ပါ"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 399ca0e..7a69c8e 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Feil ved innstilling av standardkonto"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Ingen standard er valgt"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Bare enheten"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"På enheten og %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Legg til en konto for å komme i gang"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Hvor skal kontakter lagres?"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Circle to Search"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index b81527d..086a699 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -3712,7 +3712,7 @@
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"कार्य प्रोफाइल लक हुँदा"</string>
     <string name="lock_screen_notif_minimalism" msgid="5556871004042668149">"लक स्क्रिनमा थोरै नोटिफिकेसनहरू देखाउने विकल्प"</string>
     <string name="lock_screen_notif_minimalism_summary" msgid="4607237285421814421">"लक स्क्रिनमा अझ थोरै नोटिफिकेसनहरू देखाउनुहोस्"</string>
-    <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"लक स्क्रिनमा नयाँ सूचनाहरू मात्र देखाउनुहोस्"</string>
+    <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"लक स्क्रिनमा नयाँ नोटिफिकेसनहरू मात्र देखाउनुहोस्"</string>
     <string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"यसअघि हेरिएका सूचनाहरू लक स्क्रिनबाट स्वतः हटाउनुहोस्"</string>
     <string name="lock_screen_notifs_show_full_list" msgid="6767009263807771108">"पूरा सूची"</string>
     <string name="lock_screen_notifs_show_compact" msgid="1944867696357706016">"कम्प्याक्ट भ्यू"</string>
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"मुख्य खाता सेट गर्ने क्रममा त्रुटि भयो"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"मुख्य खाता सेट गरिएको छैन"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"डिभाइस मात्र"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"डिभाइस र %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"सुरु गर्न खाता हाल्नुहोस्"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"तपाईं कन्ट्याक्टहरू कहाँ सेभ गर्न चाहनुहुन्छ"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"खोज्न सर्कल बनाउनुहोस्"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index a4bb596..93ea50e 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -2470,8 +2470,7 @@
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"Tik 3 keer op het scherm"</string>
     <string name="accessibility_shortcut_edit_screen_title" msgid="4494142067760961499">"Snelkoppelingen voor toegankelijkheid bewerken"</string>
     <string name="accessibility_shortcut_edit_screen_prompt" msgid="5966054283114856682">"Kies je sneltoets voor %1$s"</string>
-    <!-- no translation found for accessibility_shortcut_unassigned_setting_unavailable_summary (993486098872935043) -->
-    <skip />
+    <string name="accessibility_shortcut_unassigned_setting_unavailable_summary" msgid="993486098872935043">"Als je dit wilt gebruiken, zet je de snelkoppeling %1$s aan op de pagina van een toegankelijkheidsfunctie"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"Doorgaan"</string>
     <string name="accessibility_hearingaid_title" msgid="1263619711863375614">"Hoortoestellen"</string>
     <string name="accessibility_hearingaid_intro" msgid="6686620444104350629">"Stel ASHA- en LE Audio-hoortoestellen, cochleaire implantaten en andere versterkingsapparaten in en beheer die"</string>
@@ -5617,7 +5616,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Fout bij instellen van het standaardaccount"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Geen standaard ingesteld"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Alleen apparaat"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Apparaat en %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Voeg een account toe om aan de slag te gaan"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Waar contacten moeten worden opgeslagen"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Circle to Search"</string>
@@ -5628,8 +5628,8 @@
     <string name="device_supervision_switch_title" msgid="3203958797412413373">"Apparaattoezicht gebruiken"</string>
     <string name="device_supervision_switch_no_pin_summary" msgid="8294396978464347129">"Stel een pincode in om aan de slag te gaan"</string>
     <string name="keywords_supervision_settings" msgid="2580555201483955376">"toezicht, ouderlijk toezicht, opties voor ouderlijk toezicht"</string>
-    <!-- no translation found for supervision_pin_management_preference_title (961680798581006465) -->
-    <skip />
-    <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
+    <string name="supervision_pin_management_preference_title" msgid="961680798581006465">"Pincode beheren"</string>
+    <string name="supervision_pin_management_preference_summary_add" msgid="3244161328612671896">"Een methode voor pincodeherstel toevoegen"</string>
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
     <skip />
 </resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 641d532..524969a 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -5618,7 +5618,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"ଡିଫଲ୍ଟ ଆକାଉଣ୍ଟ ସେଟିଂରେ ତ୍ରୁଟି"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"କୌଣସି ଡିଫଲ୍ଟ ଆକାଉଣ୍ଟ ସେଟ କରାଯାଇନାହିଁ"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"କେବଳ ଡିଭାଇସ"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"ଡିଭାଇସ ଏବଂ %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"ଆରମ୍ଭ କରିବାକୁ ଏକ ଆକାଉଣ୍ଟ ଯୋଗ କରନ୍ତୁ"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"କଣ୍ଟାକ୍ଟଗୁଡ଼ିକୁ କେଉଁଠାରେ ସେଭ କରିବେ"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"ସର୍ଚ୍ଚ କରିବାକୁ ସର୍କଲ କରନ୍ତୁ"</string>
@@ -5633,4 +5634,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 08f4269..2fe1e58 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -2060,13 +2060,13 @@
     <string name="mouse_settings_summary" msgid="4609720443781972646">"ਪੁਆਇੰਟਰ ਸਪੀਡ, ਸਵੈਪ ਬਟਨ, ਬਟਨ ਵਿਉਂਤਣਾ"</string>
     <string name="trackpad_settings_summary" msgid="3369855644136760402">"ਪੁਆਇੰਟਰ ਸਪੀਡ, ਇਸ਼ਾਰੇ"</string>
     <string name="trackpad_tap_to_click" msgid="1938230946542070746">"ਕਲਿੱਕ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ"</string>
-    <string name="trackpad_tap_dragging_title" msgid="4198317837427535015">"ਆਈਟਮਾਂ ਨੂੰ ਲਿਜਾਉਣ ਲਈ ਟੈਪ ਕਰ ਕੇ ਘਸੀਟੋ"</string>
-    <string name="trackpad_tap_dragging_summary" msgid="2935498183201422245">"ਕਿਸੇ ਆਈਟਮ \'ਤੇ ਡਬਲ ਟੈਪ ਕਰੋ, ਦੂਜਾ ਟੈਪ ਕਰਨ \'ਤੇ ਦਬਾਈ ਰੱਖੋ ਅਤੇ ਫਿਰ ਆਈਟਮ ਨੂੰ ਲਿਜਾਉਣ ਲਈ ਉਸਨੂੰ ਘਸੀਟੋ"</string>
+    <string name="trackpad_tap_dragging_title" msgid="4198317837427535015">"ਆਈਟਮ ਦੂਜੀ ਥਾਂ ਲਿਜਾਉਣ ਲਈ ਟੈਪ ਕਰ ਕੇ ਘਸੀਟੋ"</string>
+    <string name="trackpad_tap_dragging_summary" msgid="2935498183201422245">"ਕਿਸੇ ਆਈਟਮ \'ਤੇ ਡਬਲ ਟੈਪ ਕਰੋ, ਦੂਜਾ ਟੈਪ ਕਰਨ \'ਤੇ ਦਬਾਈ ਰੱਖੋ, ਫਿਰ ਆਈਟਮ ਨੂੰ ਦੂਜੀ ਥਾਂ ਲਿਜਾਉਣ ਲਈ ਉਸਨੂੰ ਘਸੀਟੋ"</string>
     <string name="trackpad_touchpad_gesture_title" msgid="7568052847609914436">"ਟੱਚਪੈਡ ਇਸ਼ਾਰੇ"</string>
     <string name="trackpad_touchpad_gesture_summary" msgid="6256074591395359124">"ਵਿਅਕਤੀਗਤ ਟੱਚਪੈਡ ਨੈਵੀਗੇਸ਼ਨ ਇਸ਼ਾਰਿਆਂ ਨੂੰ ਵਿਉਂਤਬੱਧ ਕਰੋ"</string>
     <string name="trackpad_reverse_scrolling_title" msgid="422877284529360866">"ਉਲਟ ਸਕ੍ਰੋਲਿੰਗ"</string>
     <string name="trackpad_reverse_scrolling_summary" msgid="6048648562887499036">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਹੇਠਾਂ ਵੱਲ ਸਕ੍ਰੋਲ ਕਰਨ \'ਤੇ ਸਮੱਗਰੀ ਉੱਪਰ ਵੱਲ ਜਾਵੇਗੀ"</string>
-    <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"ਹੇਠਲਾ-ਸੱਜਾ-ਕਲਿੱਕ"</string>
+    <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"ਹੇਠਲਾ-ਸੱਜਾ ਕਲਿੱਕ"</string>
     <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"ਹੋਰ ਵਿਕਲਪਾਂ ਲਈ ਟੱਚਪੈਡ ਦੇ ਹੇਠਲੇ ਸੱਜੇ ਕੋਨੇ \'ਤੇ ਕਲਿੱਕ ਕਰੋ"</string>
     <string name="trackpad_pointer_speed" msgid="5672221910698079303">"ਕਰਸਰ ਦੀ ਗਤੀ"</string>
     <string name="three_finger_tap_preference_title" msgid="2114347152933865780">"3-ਉਂਗਲਾਂ ਵਾਲੇ ਟੈਪ ਨੂੰ ਵਿਉਂਤਬੱਧ ਕਰੋ"</string>
@@ -2469,9 +2469,8 @@
     <string name="accessibility_shortcut_type_hardware" msgid="4834144210432451916">"ਅਵਾਜ਼ ਕੁੰਜੀਆਂ ਨੂੰ ਦਬਾ ਕੇ ਰੱਖੋ"</string>
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"ਸਕ੍ਰੀਨ \'ਤੇ ਟ੍ਰਿਪਲ ਟੈਪ ਕਰੋ"</string>
     <string name="accessibility_shortcut_edit_screen_title" msgid="4494142067760961499">"ਪਹੁੰਚਯੋਗਤਾ ਸ਼ਾਰਟਕੱਟਾਂ ਦਾ ਸੰਪਾਦਨ ਕਰੋ"</string>
-    <string name="accessibility_shortcut_edit_screen_prompt" msgid="5966054283114856682">"%1$s ਲਈ ਆਪਣਾ ਸ਼ਾਰਟਕੱਟ ਚੁਣੋ"</string>
-    <!-- no translation found for accessibility_shortcut_unassigned_setting_unavailable_summary (993486098872935043) -->
-    <skip />
+    <string name="accessibility_shortcut_edit_screen_prompt" msgid="5966054283114856682">"%1$s ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਲਈ ਆਪਣਾ ਸ਼ਾਰਟਕੱਟ ਚੁਣੋ"</string>
+    <string name="accessibility_shortcut_unassigned_setting_unavailable_summary" msgid="993486098872935043">"ਇਸਦੀ ਵਰਤੋਂ ਕਰਨ ਲਈ, ਪਹੁੰਚਯੋਗਤਾ ਵਿਸ਼ੇਸ਼ਤਾ ਦੇ ਪੰਨੇ \'ਤੇ %1$s ਸ਼ਾਰਟਕੱਟ ਨੂੰ ਚਾਲੂ ਕਰੋ"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"ਜਾਰੀ ਰੱਖੋ"</string>
     <string name="accessibility_hearingaid_title" msgid="1263619711863375614">"ਸੁਣਨ ਵਾਲੇ ਡੀਵਾਈਸ"</string>
     <string name="accessibility_hearingaid_intro" msgid="6686620444104350629">"ASHA ਅਤੇ LE ਆਡੀਓ ਸੰਬੰਧੀ ਸੁਣਨ ਦੇ ਸਾਧਨ, ਕੋਕਲੀਅਰ ਇਮਪਲਾਂਟਾਂ ਅਤੇ ਹੋਰ ਐਂਪਲੀਫ਼ੀਕੇਸ਼ਨ ਡੀਵਾਈਸਾਂ ਦਾ ਸੈੱਟਅੱਪ ਕਰੋ ਅਤੇ ਉਨ੍ਹਾਂ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰੋ"</string>
@@ -3703,7 +3702,7 @@
     <string name="bubble_app_setting_bubble_conversation" msgid="1461981680982964285">"ਇਸ ਗੱਲਬਾਤ ਲਈ ਬਬਲ ਚਾਲੂ ਕਰੋ"</string>
     <string name="swipe_direction_ltr" msgid="5137180130142633085">"ਖਾਰਜ ਕਰਨ ਲਈ ਸੱਜੇ ਪਾਸੇ, ਮੀਨੂ ਦਿਖਾਉਣ ਲਈ ਖੱਬੇ ਪਾਸੇ ਸਵਾਈਪ ਕਰੋ"</string>
     <string name="swipe_direction_rtl" msgid="1707391213940663992">"ਖਾਰਜ ਕਰਨ ਲਈ ਖੱਬੇ ਪਾਸੇ, ਮੀਨੂ ਦਿਖਾਉਣ ਲਈ ਸੱਜੇ ਪਾਸੇ ਸਵਾਈਪ ਕਰੋ"</string>
-    <string name="silent_notifications_status_bar" msgid="6113307620588767516">"ਸਥਿਤੀ ਪੱਟੀ ਵਿੱਚ ਸ਼ਾਂਤ ਸੂਚਨਾਵਾਂ ਲੁਕਾਓ"</string>
+    <string name="silent_notifications_status_bar" msgid="6113307620588767516">"ਸ਼ਾਂਤ ਸੂਚਨਾਵਾਂ ਸਥਿਤੀ ਪੱਟੀ \'ਤੇ ਨਾ ਦਿਖਾਓ"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"ਲਾਈਟ ਨੂੰ ਟਿਮ-ਟਿਮਾਓ"</string>
     <string name="lock_screen_notifications_title" msgid="2876323153692406203">"ਪਰਦੇਦਾਰੀ"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"ਲਾਕ ਸਕ੍ਰੀਨ ਛੱਡੋ"</string>
@@ -3785,7 +3784,7 @@
     <string name="notifications_sent_daily" msgid="10274479224185437">"{count,plural, =1{ਪ੍ਰਤੀ ਦਿਨ ਲਗਭਗ # ਸੂਚਨਾ}one{ਪ੍ਰਤੀ ਦਿਨ ਲਗਭਗ # ਸੂਚਨਾ}other{ਪ੍ਰਤੀ ਦਿਨ ਲਗਭਗ # ਸੂਚਨਾਵਾਂ}}"</string>
     <string name="notifications_sent_weekly" msgid="7895656213187555346">"{count,plural, =1{ਪ੍ਰਤੀ ਹਫ਼ਤਾ ਲਗਭਗ # ਸੂਚਨਾ}one{ਪ੍ਰਤੀ ਹਫ਼ਤਾ ਲਗਭਗ # ਸੂਚਨਾ}other{ਪ੍ਰਤੀ ਹਫ਼ਤਾ ਲਗਭਗ # ਸੂਚਨਾਵਾਂ}}"</string>
     <string name="notifications_sent_never" msgid="9081278709126812062">"ਕਦੇ ਵੀ ਨਹੀਂ"</string>
-    <string name="manage_notification_access_title" msgid="4154723216570646451">"ਸੂਚਨਾ ਨੂੰ ਪੜ੍ਹੋ, ਉਸਦਾ ਜਵਾਬ ਦਿਓ ਅਤੇ ਉਸਨੂੰ ਕੰਟਰੋਲ ਕਰੋ"</string>
+    <string name="manage_notification_access_title" msgid="4154723216570646451">"ਸੂਚਨਾ ਨੂੰ ਪੜ੍ਹਨ, ਉਸਦਾ ਜਵਾਬ ਦੇਣ ਅਤੇ ਉਸਨੂੰ ਕੰਟਰੋਲ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ"</string>
     <string name="manage_notification_access_summary" msgid="2907135226478903997">"ਕੰਟਰੋਲ ਕਰੋ ਕਿ ਕਿਹੜੀਆਂ ਐਪਾਂ ਅਤੇ ਡੀਵਾਈਸ ਸੂਚਨਾਵਾਂ ਪੜ੍ਹ ਸਕਦੇ ਹਨ"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਸੂਚਨਾਵਾਂ \'ਤੇ ਪਹੁੰਚ ਨੂੰ ਬਲਾਕ ਕੀਤਾ ਗਿਆ ਹੈ"</string>
     <string name="notification_assistant_title" msgid="5889201903272393099">"ਵਿਸਤ੍ਰਿਤ ਸੂਚਨਾਵਾਂ"</string>
@@ -4562,7 +4561,7 @@
     <string name="emergency_settings_preference_title" msgid="6183455153241187148">"ਸੁਰੱਖਿਆ ਅਤੇ ਐਮਰਜੈਂਸੀ"</string>
     <string name="emergency_dashboard_summary" msgid="401033951074039302">"ਐਮਰਜੈਂਸੀ ਸਹਾਇਤਾ, ਡਾਕਟਰੀ ਜਾਣਕਾਰੀ, ਅਲਰਟ"</string>
     <string name="edge_to_edge_navigation_title" msgid="714427081306043819">"ਇਸ਼ਾਰਾ ਨੈਵੀਗੇਸ਼ਨ"</string>
-    <string name="edge_to_edge_navigation_summary" msgid="818109176611921504">"ਹੋਮ \'ਤੇ ਜਾਣ ਲਈ, ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਾਂ ਤੋਂ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ। ਐਪਾਂ ਵਿਚਾਲੇ ਸਵਿੱਚ ਕਰਨ ਲਈ, ਹੇਠਾਂ ਤੋਂ ਉੱਤੇ ਵੱਲ ਸਵਾਈਪ ਕਰ ਕੇ ਦਬਾਈ ਰੱਖੋ ਅਤੇ ਫਿਰ ਛੱਡੋ। ਵਾਪਸ ਜਾਣ ਲਈ, ਸਕ੍ਰੀਨ ਦੇ ਜਾਂ ਤਾਂ ਖੱਬੇ ਜਾਂ ਸੱਜੇ ਕਿਨਾਰੇ ਤੋਂ ਸਵਾਈਪ ਕਰੋ।"</string>
+    <string name="edge_to_edge_navigation_summary" msgid="818109176611921504">"ਹੋਮ \'ਤੇ ਜਾਣ ਲਈ, ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਾਂ ਤੋਂ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ। ਐਪਾਂ ਵਿਚਾਲੇ ਸਵਿੱਚ ਕਰਨ ਲਈ, ਹੇਠਾਂ ਤੋਂ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰ ਕੇ ਦਬਾਈ ਰੱਖੋ ਅਤੇ ਫਿਰ ਛੱਡੋ। ਵਾਪਸ ਜਾਣ ਲਈ, ਸਕ੍ਰੀਨ ਦੇ ਖੱਬੇ ਜਾਂ ਸੱਜੇ ਕਿਨਾਰੇ ਤੋਂ ਸਵਾਈਪ ਕਰੋ।"</string>
     <string name="legacy_navigation_title" msgid="7877402855994423727">"3-ਬਟਨ ਨੈਵੀਗੇਸ਼ਨ"</string>
     <string name="legacy_navigation_summary" msgid="5905301067778326433">"ਆਪਣੀ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਾਂ ਦਿੱਤੇ ਬਟਨਾਂ ਨਾਲ ਵਾਪਸ ਜਾਓ, ਹੋਮ \'ਤੇ ਜਾਓ ਅਤੇ ਐਪਾਂ ਸਵਿੱਚ ਕਰੋ।"</string>
     <string name="nav_tutorial_button_description" msgid="7195363082216233970">"ਇਸ਼ਾਰਾ ਨੈਵੀਗੇਸ਼ਨ ਦਾ ਟਿਊਟੋਰੀਅਲ ਸ਼ੁਰੂ ਕਰੋ।"</string>
@@ -4948,7 +4947,7 @@
     <string name="roaming_check_price_warning" msgid="5876977438036791361">"ਕੀਮਤਾਂ ਜਾਣਨ ਲਈ ਆਪਣੇ ਨੈੱਟਵਰਕ ਪ੍ਰਦਾਨਕ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।"</string>
     <string name="mobile_network_mode_error" msgid="9222056129897416074">"ਅਵੈਧ ਨੈੱਟਵਰਕ ਮੋਡ <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. ਅਣਡਿੱਠ ਕਰੋ।"</string>
     <string name="satellite_setting_title" msgid="2543034229989047673">"ਸੈਟੇਲਾਈਟ ਸੁਨੇਹਾ"</string>
-    <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"ਸੈਟੇਲਾਈਟ ਰਾਹੀਂ ਲਿਖਤ ਸੁਨੇਹੇ ਭੇਜੋ ਅਤੇ ਪ੍ਰਾਪਤ ਕਰੋ। ਤੁਹਾਡੇ ਖਾਤੇ ਵਿੱਚ ਸ਼ਾਮਲ ਹੈ।"</string>
+    <string name="satellite_setting_enabled_summary" msgid="3554127722727530845">"ਸੈਟੇਲਾਈਟ ਰਾਹੀਂ ਲਿਖਤ ਸੁਨੇਹੇ ਭੇਜੋ ਅਤੇ ਪ੍ਰਾਪਤ ਕਰੋ। ਇਹ ਸੁਵਿਧਾ ਤੁਹਾਡੇ ਖਾਤੇ ਵਿੱਚ ਸ਼ਾਮਲ ਹੈ।"</string>
     <string name="satellite_setting_disabled_summary" msgid="8428393986403708690">"ਸੈਟੇਲਾਈਟ ਰਾਹੀਂ ਲਿਖਤ ਸੁਨੇਹੇ ਭੇਜੋ ਅਤੇ ਪ੍ਰਾਪਤ ਕਰੋ। ਤੁਹਾਡੇ ਖਾਤੇ ਨਾਲ ਇਸ ਸੁਵਿਧਾ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ।"</string>
     <string name="keywords_satellite_setting" msgid="613553612424945946">"ਸੈਟੇਲਾਈਟ ਸੁਨੇਹਾ, ਸੈਟੇਲਾਈਟ ਕਨੈਕਟੀਵਿਟੀ"</string>
     <string name="category_name_about_satellite_messaging" msgid="4978095955643523120">"<xliff:g id="SUBJECT">%1$s</xliff:g> ਬਾਰੇ"</string>
@@ -5442,7 +5441,7 @@
     <string name="flash_notifications_summary_on_camera" msgid="3286405833586333730">"ਚਾਲੂ / ਕੈਮਰਾ ਫਲੈਸ਼"</string>
     <string name="flash_notifications_summary_on_screen" msgid="9040640799633336219">"ਚਾਲੂ / ਸਕ੍ਰੀਨ ਫਲੈਸ਼"</string>
     <string name="flash_notifications_summary_on_camera_and_screen" msgid="2326268141063768701">"ਚਾਲੂ / ਕੈਮਰਾ ਅਤੇ ਸਕ੍ਰੀਨ ਫਲੈਸ਼"</string>
-    <string name="flash_notifications_intro" msgid="8409873413480928249">"ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਕਰਨ ਜਾਂ ਅਲਾਰਮ ਵੱਜਣ \'ਤੇ, ਕੈਮਰੇ ਦੀ ਲਾਈਟ ਜਾਂ ਸਕ੍ਰੀਨ ਨੂੰ ਫਲੈਸ਼ ਕਰੋ"</string>
+    <string name="flash_notifications_intro" msgid="8409873413480928249">"ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਹੋਣ ਜਾਂ ਅਲਾਰਮ ਵੱਜਣ \'ਤੇ, ਕੈਮਰੇ ਦੀ ਲਾਈਟ ਜਾਂ ਸਕ੍ਰੀਨ ਨੂੰ ਫਲੈਸ਼ ਕਰੋ"</string>
     <string name="flash_notifications_intro_without_camera_flash" msgid="6297337174487793891">"ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਕਰਨ ਜਾਂ ਅਲਾਰਮ ਵੱਜਣ \'ਤੇ, ਸਕ੍ਰੀਨ ਨੂੰ ਫਲੈਸ਼ ਕਰੋ"</string>
     <string name="flash_notifications_note" msgid="2426125248448055075">"ਜੇ ਤੁਸੀਂ ਲਾਈਟ ਦੇ ਪ੍ਰਤੀ ਸੰਵੇਦਨਸ਼ੀਲ ਹੋ, ਤਾਂ ਫਲੈਸ਼ ਸੂਚਨਾਵਾਂ ਦੀ ਵਰਤੋਂ ਸਾਵਧਾਨੀ ਨਾਲ ਕਰੋ"</string>
     <string name="flash_notifications_keywords" msgid="2458759275318514836">"ਫਲੈਸ਼, ਲਾਈਟ, ਘੱਟ ਸੁਣਨ ਵਾਲੇ, ਘੱਟ ਸੁਣਨਾ"</string>
@@ -5617,19 +5616,20 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"ਪੂਰਵ-ਨਿਰਧਾਰਿਤ ਖਾਤਾ ਸੈੱਟ ਕਰਨ ਵਿੱਚ ਗੜਬੜ ਹੋਈ"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"ਕੁਝ ਵੀ ਪੂਰਵ-ਨਿਰਧਾਰਿਤ ਵਜੋਂ ਸੈੱਟ ਨਹੀਂ ਹੈ"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"ਸਿਰਫ਼ ਡੀਵਾਈਸ"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"ਡੀਵਾਈਸ ਅਤੇ %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"ਸ਼ੁਰੂਆਤ ਕਰਨ ਲਈ ਕੋਈ ਖਾਤਾ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"ਸੰਪਰਕ ਕਿੱਥੇ ਰੱਖਿਅਤ ਕਰਨੇ ਹਨ"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"ਖੋਜਣ ਲਈ ਚੱਕਰ ਬਣਾਓ"</string>
-    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"ਆਪਣੀ ਸਕ੍ਰੀਨ \'ਤੇ ਮੌਜੂਦ ਸਮੱਗਰੀ ਦੀ ਵਰਤੋਂ ਕਰ ਕੇ ਖੋਜਣ ਲਈ ਹੋਮ ਬਟਨ ਨੈਵੀਗੇਸ਼ਨ ਹੈਂਡਲ ਨੂੰ ਸਪਰਸ਼ ਕਰ ਕੇ ਰੱਖੋ।"</string>
+    <string name="search_gesture_feature_summary" msgid="1793056495030564014">"ਆਪਣੀ ਸਕ੍ਰੀਨ \'ਤੇ ਮੌਜੂਦ ਸਮੱਗਰੀ ਦੀ ਵਰਤੋਂ ਕਰ ਕੇ ਖੋਜਣ ਲਈ ਹੋਮ ਬਟਨ ਜਾਂ ਨੈਵੀਗੇਸ਼ਨ ਹੈਂਡਲ ਨੂੰ ਸਪਰਸ਼ ਕਰ ਕੇ ਰੱਖੋ।"</string>
     <string name="device_detail_icon_content_description" msgid="6699151424374841937">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>. ਡੀਵਾਈਸ ਦੇ ਵੇਰਵੇ ਦਾ ਸੰਰੂਪਣ ਕਰੋ।"</string>
     <string name="supervision_settings_title" msgid="8383827215386872736">"ਨਿਗਰਾਨੀ"</string>
     <string name="supervision_settings_summary" msgid="5020634300370322741">"ਸਮੱਗਰੀ ਸੰਬੰਧੀ ਪਾਬੰਦੀਆਂ ਅਤੇ ਹੋਰ ਸੀਮਾਵਾਂ"</string>
     <string name="device_supervision_switch_title" msgid="3203958797412413373">"ਡੀਵਾਈਸ ਨਿਗਰਾਨੀ ਵਰਤੋ"</string>
     <string name="device_supervision_switch_no_pin_summary" msgid="8294396978464347129">"ਸ਼ੁਰੂਆਤ ਕਰਨ ਲਈ ਪਿੰਨ ਦਾ ਸੈੱਟਅੱਪ ਕਰੋ"</string>
     <string name="keywords_supervision_settings" msgid="2580555201483955376">"ਨਿਗਰਾਨੀ, ਮਾਪਿਆਂ ਦੁਆਰਾ ਨਿਗਰਾਨੀ, ਮਾਪਿਆਂ ਦੇ ਕੰਟਰੋਲ"</string>
-    <!-- no translation found for supervision_pin_management_preference_title (961680798581006465) -->
-    <skip />
-    <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
+    <string name="supervision_pin_management_preference_title" msgid="961680798581006465">"ਪਿੰਨ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰੋ"</string>
+    <string name="supervision_pin_management_preference_summary_add" msgid="3244161328612671896">"ਪਿੰਨ ਰਿਕਵਰੀ ਵਿਧੀ ਨੂੰ ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
     <skip />
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 695aa08..f558c8d 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -5619,7 +5619,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Podczas ustawiania konta domyślnego wystąpił błąd"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Nie ustawiono konta domyślnego"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Tylko urządzenie"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Urządzenie i %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Na początek dodaj konto"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Gdzie zapisać kontakty"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Zaznacz, aby wyszukać"</string>
@@ -5634,4 +5635,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 22fd381..24378ae 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -4511,7 +4511,7 @@
     <string name="keywords_long_background_tasks" msgid="5788956269136054574">"jobs longos, transferência de dados, tarefas em segundo plano"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Redefinir limite de taxa do ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"O limite de taxa do ShortcutManager foi redefinido"</string>
-    <string name="notification_suggestion_title" msgid="6309263655965785411">"Informações na tela de bloqueio"</string>
+    <string name="notification_suggestion_title" msgid="6309263655965785411">"Controlar informações na tela de bloqueio"</string>
     <string name="notification_suggestion_summary" msgid="7615611244249276113">"Mostrar ou ocultar o conteúdo da notificação"</string>
     <string name="page_tab_title_support" msgid="3235725053332345773">"Dicas e suporte"</string>
     <string name="developer_smallest_width" msgid="632354817870920911">"Menor largura"</string>
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Erro ao definir a conta padrão"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Nenhuma conta padrão configurada"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Somente dispositivo"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Dispositivo e %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Adicione uma conta para começar"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Onde salvar contatos"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Circule para pesquisar"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index a8cae2d..dc6b2e2 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Erro ao predefinir a conta"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Nenhuma conta predefinida"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Apenas no dispositivo"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Dispositivo e %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Adicione uma conta para começar"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Onde guardar os contactos"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Circundar para Pesquisar"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 22fd381..24378ae 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -4511,7 +4511,7 @@
     <string name="keywords_long_background_tasks" msgid="5788956269136054574">"jobs longos, transferência de dados, tarefas em segundo plano"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Redefinir limite de taxa do ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"O limite de taxa do ShortcutManager foi redefinido"</string>
-    <string name="notification_suggestion_title" msgid="6309263655965785411">"Informações na tela de bloqueio"</string>
+    <string name="notification_suggestion_title" msgid="6309263655965785411">"Controlar informações na tela de bloqueio"</string>
     <string name="notification_suggestion_summary" msgid="7615611244249276113">"Mostrar ou ocultar o conteúdo da notificação"</string>
     <string name="page_tab_title_support" msgid="3235725053332345773">"Dicas e suporte"</string>
     <string name="developer_smallest_width" msgid="632354817870920911">"Menor largura"</string>
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Erro ao definir a conta padrão"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Nenhuma conta padrão configurada"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Somente dispositivo"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Dispositivo e %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Adicione uma conta para começar"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Onde salvar contatos"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Circule para pesquisar"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 43aef42..0635c79 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -5618,7 +5618,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Eroare la setarea contului prestabilit"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Nicio setare prestabilită"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Numai pe dispozitiv"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Dispozitiv și %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Adaugă un cont pentru a începe"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Unde să salvezi agenda"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Încercuiește și caută"</string>
@@ -5633,4 +5634,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 26eb35c..01dc874 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1788,9 +1788,9 @@
     <string name="lockpassword_confirm_your_pin_header_frp" msgid="8285647793164729982">"Подтверждение PIN-кода"</string>
     <string name="lockpassword_confirm_your_password_header_frp" msgid="7932240547542564033">"Подтверждение пароля"</string>
     <string name="lockpassword_remote_validation_header" msgid="4992647285784962073">"Проверка личности"</string>
-    <string name="lockpassword_remote_validation_pattern_details" msgid="4655537780358707983">"Для переноса учетных записей Google, настроек и прочего введите графический ключ от другого вашего устройства. Ключ зашифрован."</string>
-    <string name="lockpassword_remote_validation_pin_details" msgid="2373654227583206297">"Для переноса учетных записей Google, настроек и прочего введите PIN-код от другого вашего устройства. PIN-код зашифрован."</string>
-    <string name="lockpassword_remote_validation_password_details" msgid="3482328925925888340">"Для переноса учетных записей Google, настроек и прочего введите пароль от другого вашего устройства. Пароль зашифрован."</string>
+    <string name="lockpassword_remote_validation_pattern_details" msgid="4655537780358707983">"Для переноса аккаунтов Google, настроек и прочего введите графический ключ от другого вашего устройства. Ключ зашифрован."</string>
+    <string name="lockpassword_remote_validation_pin_details" msgid="2373654227583206297">"Для переноса аккаунтов Google, настроек и прочего введите PIN-код от другого вашего устройства. PIN-код зашифрован."</string>
+    <string name="lockpassword_remote_validation_password_details" msgid="3482328925925888340">"Для переноса аккаунтов Google, настроек и прочего введите пароль от другого вашего устройства. Пароль зашифрован."</string>
     <string name="lockpassword_remote_validation_set_pattern_as_screenlock" msgid="7595104317648465901">"Использовать графический ключ для разблокировки"</string>
     <string name="lockpassword_remote_validation_set_pin_as_screenlock" msgid="509672303005547218">"Использовать PIN-код для разблокировки"</string>
     <string name="lockpassword_remote_validation_set_password_as_screenlock" msgid="2066701840753591922">"Использовать пароль для разблокировки"</string>
@@ -2470,8 +2470,7 @@
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"Тройное нажатие на экран"</string>
     <string name="accessibility_shortcut_edit_screen_title" msgid="4494142067760961499">"Настройки быстрого включения специальных возможностей"</string>
     <string name="accessibility_shortcut_edit_screen_prompt" msgid="5966054283114856682">"Выберите сочетание клавиш для функции \"%1$s\""</string>
-    <!-- no translation found for accessibility_shortcut_unassigned_setting_unavailable_summary (993486098872935043) -->
-    <skip />
+    <string name="accessibility_shortcut_unassigned_setting_unavailable_summary" msgid="993486098872935043">"Чтобы использовать этот параметр, включите быстрый запуск функции \"%1$s\" на странице специальных возможностей"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"Далее"</string>
     <string name="accessibility_hearingaid_title" msgid="1263619711863375614">"Слуховые аппараты"</string>
     <string name="accessibility_hearingaid_intro" msgid="6686620444104350629">"Управляйте слуховыми аппаратами ASHA и LE Audio, кохлеарными имплантатами и другими устройствами усиления звука"</string>
@@ -5619,7 +5618,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Не удалось выбрать аккаунт по умолчанию."</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Аккаунт по умолчанию не выбран"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Только на устройстве"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Устройство и %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Сначала добавьте аккаунт"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Куда сохранять контакты"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Обвести и найти"</string>
@@ -5630,8 +5630,8 @@
     <string name="device_supervision_switch_title" msgid="3203958797412413373">"Включить родительский контроль за устройством"</string>
     <string name="device_supervision_switch_no_pin_summary" msgid="8294396978464347129">"Сначала установите PIN-код"</string>
     <string name="keywords_supervision_settings" msgid="2580555201483955376">"родительский контроль"</string>
-    <!-- no translation found for supervision_pin_management_preference_title (961680798581006465) -->
-    <skip />
-    <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
+    <string name="supervision_pin_management_preference_title" msgid="961680798581006465">"Управление PIN-кодом"</string>
+    <string name="supervision_pin_management_preference_summary_add" msgid="3244161328612671896">"Добавить способ восстановления PIN-кода"</string>
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
     <skip />
 </resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index d922e3f..90b035c 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -2470,8 +2470,7 @@
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"තිරය තෙවරක් තට්ටු කරන්න"</string>
     <string name="accessibility_shortcut_edit_screen_title" msgid="4494142067760961499">"ප්‍රවේශ්‍යතා කෙටිමං සංස්කරණය කරන්න"</string>
     <string name="accessibility_shortcut_edit_screen_prompt" msgid="5966054283114856682">"%1$s සඳහා ඔබේ කෙටිමඟ තෝරා ගන්න"</string>
-    <!-- no translation found for accessibility_shortcut_unassigned_setting_unavailable_summary (993486098872935043) -->
-    <skip />
+    <string name="accessibility_shortcut_unassigned_setting_unavailable_summary" msgid="993486098872935043">"මෙය භාවිත කිරීමට, ප්‍රවේශ්‍යතා විශේෂාංග පිටුවක %1$s කෙටිමඟ ක්‍රියාත්මක කරන්න."</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"ඉදිරියට යන්න"</string>
     <string name="accessibility_hearingaid_title" msgid="1263619711863375614">"ශ්‍රවණ උපාංග"</string>
     <string name="accessibility_hearingaid_intro" msgid="6686620444104350629">"ASHA සහ LE ශ්‍රව්‍ය ශ්‍රවණාධාර, දර්වාකාර බද්ධ කිරීම්, සහ අනෙකුත් විස්තාරණ උපාංග පිහිටුවීම සහ කළමනාකරණය කිරීම"</string>
@@ -3559,8 +3558,8 @@
     <string name="mode_aod_title" msgid="5903435070341237325">"තිරය අඳුරුව තබා ගන්න"</string>
     <string name="mode_aod_title_secondary_list" msgid="8268180392811027557">"තිරය අඳුරුව තබා ගන්න"</string>
     <string name="mode_aod_summary" msgid="7516159044827627065">"සැම විට සක්‍රීය සංදර්ශකය අබල කරන්න"</string>
-    <string name="mode_wallpaper_title" msgid="5549693923133928374">"බිතුපත අඳුරු කරන්න"</string>
-    <string name="mode_wallpaper_title_secondary_list" msgid="5034602021811580157">"බිතුපත අඳුරු කරන්න"</string>
+    <string name="mode_wallpaper_title" msgid="5549693923133928374">"වෝල්පේපරය අඳුරු කරන්න"</string>
+    <string name="mode_wallpaper_title_secondary_list" msgid="5034602021811580157">"වෝල්පේපරය අඳුරු කරන්න"</string>
     <string name="mode_wallpaper_summary" msgid="665480011615603784">"බිතුපතේ දීප්තිය පෙරන්න"</string>
     <string name="mode_dark_theme_title" msgid="8099007897943513209">"අඳුරු තේමාව සබල කරන්න"</string>
     <string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"අඳුරු තේමාව සබල කරන්න"</string>
@@ -5617,7 +5616,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"පෙරනිමි ගිණුම සැකසීමේ දෝෂයකි"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"පෙරනිමි සැකසීමක් නැත"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"උපාංගය පමණි"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"උපාංගය සහ %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"පටන් ගැනීමට ගිණුමක් එක් කරන්න"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"සම්බන්ධතා සුරැකිය යුතු ස්ථානය"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"සෙවීමට කවයසෙවීමට කවය අදින්න"</string>
@@ -5628,8 +5628,8 @@
     <string name="device_supervision_switch_title" msgid="3203958797412413373">"උපාංග අධීක්ෂණය භාවිතා කරන්න"</string>
     <string name="device_supervision_switch_no_pin_summary" msgid="8294396978464347129">"පටන් ගැනීමට PIN පිහිටුවන්න"</string>
     <string name="keywords_supervision_settings" msgid="2580555201483955376">"අධීක්ෂණය, දෙමාපිය අධීක්ෂණය, දෙමාපිය පාලනයන්"</string>
-    <!-- no translation found for supervision_pin_management_preference_title (961680798581006465) -->
-    <skip />
-    <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
+    <string name="supervision_pin_management_preference_title" msgid="961680798581006465">"PIN කළමනාකරණය කරන්න"</string>
+    <string name="supervision_pin_management_preference_summary_add" msgid="3244161328612671896">"PIN ප්‍රතිසාධන ක්‍රමයක් එක් කරන්න"</string>
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
     <skip />
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 735f2ac..c407a2a 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -611,7 +611,7 @@
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Senzor odtlačkov prstov nie je možné používať"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Navštívte poskytovateľa opráv."</string>
     <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Odomykať odtlačkom prsta pri vypnutej obrazovke"</string>
-    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Používajte odomknutie odtlačkom prsta aj keď je obrazovka vypnutá"</string>
+    <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Používajte odomknutie odtlačkom prsta, aj keď je obrazovka vypnutá"</string>
     <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Vypnutá obrazovka, odomknutie"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Ďalšie nastavenia zabezpečenia"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Zámka pracovného profilu, šifrovanie a ďalšie"</string>
@@ -2469,9 +2469,8 @@
     <string name="accessibility_shortcut_type_hardware" msgid="4834144210432451916">"Pridržanie tlačidiel hlasitosti"</string>
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"Trojité klepnutie na obrazovku"</string>
     <string name="accessibility_shortcut_edit_screen_title" msgid="4494142067760961499">"Úprava skratiek dostupnosti"</string>
-    <string name="accessibility_shortcut_edit_screen_prompt" msgid="5966054283114856682">"Vyberte skratku pre %1$s"</string>
-    <!-- no translation found for accessibility_shortcut_unassigned_setting_unavailable_summary (993486098872935043) -->
-    <skip />
+    <string name="accessibility_shortcut_edit_screen_prompt" msgid="5966054283114856682">"Vyberte skratku funkcie %1$s"</string>
+    <string name="accessibility_shortcut_unassigned_setting_unavailable_summary" msgid="993486098872935043">"Ak chcete skratku %1$s používať, zapnite ju na stránke funkcie dostupnosti"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"Ďalej"</string>
     <string name="accessibility_hearingaid_title" msgid="1263619711863375614">"Načúvacie zariadenia"</string>
     <string name="accessibility_hearingaid_intro" msgid="6686620444104350629">"Nastavte a spravujte načúvadlá ASHA a LE Audio, kochleárne implantáty a ďalšie zosilňovacie zariadenia"</string>
@@ -4159,7 +4158,7 @@
     <string name="filter_instant_apps" msgid="2292108467020380068">"Okamžité aplikácie"</string>
     <string name="filter_notif_blocked_apps" msgid="1065653868850012325">"Vypnuté"</string>
     <string name="advanced_apps" msgid="7643010673326578815">"Rozšírené"</string>
-    <string name="app_permissions" msgid="8666537659217653626">"Správca povolení"</string>
+    <string name="app_permissions" msgid="8666537659217653626">"Správa povolení"</string>
     <string name="app_data_sharing_updates_title" msgid="1694297952320402788">"Aktualizácie zdieľania údajov o polohe"</string>
     <string name="app_data_sharing_updates_summary" msgid="4465929918457739443">"Skontrolujte aplikácie, ktoré zmenili spôsob zdieľania vašich údajov o polohe"</string>
     <string name="tap_to_wake" msgid="3313433536261440068">"Zobudiť klepnutím"</string>
@@ -5613,13 +5612,14 @@
     <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>
-    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Len senzory zariadenia"</string>
+    <string name="contacts_storage_device_only_preference_label" msgid="970250816918108264">"Iba zariadenie"</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_set_default_account_error_message" msgid="849847649756411393">"Pri nastavovaní predvoleného účtu sa vyskytla chyba"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Nie je nastavená žiadna predvolená hodnota"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Iba zariadenie"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Zariadenie a %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Začnite pridaním účtu"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Kam ukladať kontakty"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Vyhľadávanie krúžením"</string>
@@ -5630,8 +5630,8 @@
     <string name="device_supervision_switch_title" msgid="3203958797412413373">"Používať dohľad nad zariadením"</string>
     <string name="device_supervision_switch_no_pin_summary" msgid="8294396978464347129">"Začať nastavením kódu PIN"</string>
     <string name="keywords_supervision_settings" msgid="2580555201483955376">"dohľad, rodičovský dohľad, rodičovská kontrola"</string>
-    <!-- no translation found for supervision_pin_management_preference_title (961680798581006465) -->
-    <skip />
-    <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
+    <string name="supervision_pin_management_preference_title" msgid="961680798581006465">"Správa kódu PIN"</string>
+    <string name="supervision_pin_management_preference_summary_add" msgid="3244161328612671896">"Pridajte spôsob obnovenia kódu PIN"</string>
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
     <skip />
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 53a9e5b..2470091 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -1085,7 +1085,7 @@
     <string name="wifi_dpp_scan_qr_code" msgid="3543923817779444434">"Optično preberite kodo QR"</string>
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Kodo QR spodaj nastavite na sredino, da vzpostavite povezavo z omrežjem »<xliff:g id="SSID">%1$s</xliff:g>«."</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Če se želite pridružiti omrežju Wi‑Fi, preberite kodo QR."</string>
-    <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Delite omrežje Wi‑Fi"</string>
+    <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Delite Wi‑Fi"</string>
     <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Če se želite pridružiti omrežju »<xliff:g id="SSID">%1$s</xliff:g>«, kodo QR preberite z drugo napravo."</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Če želite vzpostaviti povezavo z omrežjem »<xliff:g id="SSID">%1$s</xliff:g>«, preberite to kodo QR"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Poskusite znova. Če se težava ponavlja, se obrnite na proizvajalca naprave."</string>
@@ -2470,8 +2470,7 @@
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"Trikratni dotik zaslona"</string>
     <string name="accessibility_shortcut_edit_screen_title" msgid="4494142067760961499">"Urejanje bližnjic za dostopnost"</string>
     <string name="accessibility_shortcut_edit_screen_prompt" msgid="5966054283114856682">"Izberite bližnjico za: %1$s"</string>
-    <!-- no translation found for accessibility_shortcut_unassigned_setting_unavailable_summary (993486098872935043) -->
-    <skip />
+    <string name="accessibility_shortcut_unassigned_setting_unavailable_summary" msgid="993486098872935043">"Če želite to uporabljati, na strani funkcije dostopnosti vklopite bližnjico »%1$s«"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"Naprej"</string>
     <string name="accessibility_hearingaid_title" msgid="1263619711863375614">"Slušni pripomočki"</string>
     <string name="accessibility_hearingaid_intro" msgid="6686620444104350629">"Nastavitev in upravljanje slušnih pripomočkov, polževih vsadkov in drugih naprav za ojačitev, ki jih podpira protokol ASHA ali LE zvok"</string>
@@ -5619,7 +5618,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Napaka pri nastavljanju privzetega računa"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Nastavljen ni noben privzeti račun"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Samo v napravi"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Naprava in %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Za začetek dodajte račun"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Kam želite shraniti stike"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Iskanje z obkroževanjem"</string>
@@ -5630,8 +5630,8 @@
     <string name="device_supervision_switch_title" msgid="3203958797412413373">"Uporabi nadzor naprave"</string>
     <string name="device_supervision_switch_no_pin_summary" msgid="8294396978464347129">"Če želite začeti, nastavite kodo PIN"</string>
     <string name="keywords_supervision_settings" msgid="2580555201483955376">"nadzor, starševski nadzor"</string>
-    <!-- no translation found for supervision_pin_management_preference_title (961680798581006465) -->
-    <skip />
-    <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
+    <string name="supervision_pin_management_preference_title" msgid="961680798581006465">"Upravljanje kode PIN"</string>
+    <string name="supervision_pin_management_preference_summary_add" msgid="3244161328612671896">"Dodajte način za obnovitev kode PIN"</string>
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
     <skip />
 </resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 722fdda..f33a181 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Gabim gjatë caktimit të llogarisë së parazgjedhur"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Nuk është caktuar asnjë e parazgjedhur"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Vetëm në pajisje"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Pajisja dhe %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Shto një llogari për të filluar"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Ku të ruhen kontaktet"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Qarko për të kërkuar"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index d3f3330..fcd40a7 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -2470,8 +2470,7 @@
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"Додирните екран трипут"</string>
     <string name="accessibility_shortcut_edit_screen_title" msgid="4494142067760961499">"Измените пречице за приступачност"</string>
     <string name="accessibility_shortcut_edit_screen_prompt" msgid="5966054283114856682">"Изаберите пречицу за %1$s"</string>
-    <!-- no translation found for accessibility_shortcut_unassigned_setting_unavailable_summary (993486098872935043) -->
-    <skip />
+    <string name="accessibility_shortcut_unassigned_setting_unavailable_summary" msgid="993486098872935043">"Да бисте користили ово, укључите пречицу %1$s на страници функције приступачности"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"Настави"</string>
     <string name="accessibility_hearingaid_title" msgid="1263619711863375614">"Слушни апарати"</string>
     <string name="accessibility_hearingaid_intro" msgid="6686620444104350629">"Подесите слушне апарате који имају ASHA и LE Audio, кохлеарне импланте и уређаје за појачавање звука и управљајте њима"</string>
@@ -5618,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Грешка при подешавању подразумеваног налога"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Није подешен подразумевани налог"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Само уређај"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Уређај и %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Додајте налог да бисте започели"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Где можете да чувате контакте"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Претрага заокруживањем"</string>
@@ -5629,8 +5629,8 @@
     <string name="device_supervision_switch_title" msgid="3203958797412413373">"Користи надзор уређаја"</string>
     <string name="device_supervision_switch_no_pin_summary" msgid="8294396978464347129">"Подесите PIN да бисте започели"</string>
     <string name="keywords_supervision_settings" msgid="2580555201483955376">"надзор, родитељски надзор, родитељска контрола"</string>
-    <!-- no translation found for supervision_pin_management_preference_title (961680798581006465) -->
-    <skip />
-    <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
+    <string name="supervision_pin_management_preference_title" msgid="961680798581006465">"Управљајте PIN-ом"</string>
+    <string name="supervision_pin_management_preference_summary_add" msgid="3244161328612671896">"Додајте метод опоравка PIN-ом"</string>
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
     <skip />
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 1dfab02..9dd0ba8 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -239,8 +239,7 @@
     <string name="temperature_preferences_title" msgid="5009881556503629058">"Temperatur"</string>
     <string name="first_day_of_week_preferences_title" msgid="1971850087589599553">"Första dagen i veckan"</string>
     <string name="numbers_preferences_title" msgid="8197418984391195446">"Sifferinställningar"</string>
-    <!-- no translation found for measurement_system_preferences_title (5539250190895110890) -->
-    <skip />
+    <string name="measurement_system_preferences_title" msgid="5539250190895110890">"Måttsystem"</string>
     <string name="default_string_of_regional_preference" msgid="3428899072914884203">"Använd standardinställning"</string>
     <string name="celsius_temperature_unit" msgid="8896459071273084507">"Celsius (°C)"</string>
     <string name="fahrenheit_temperature_unit" msgid="1118677820614569801">"Fahrenheit (°F)"</string>
@@ -253,12 +252,9 @@
     <string name="saturday_first_day_of_week" msgid="3702282590450322727">"lördag"</string>
     <string name="title_regional_pref_footer" msgid="7450438024324794380">"Om en app inte har stöd för regionsinställningar används appens standardinställningar."</string>
     <string name="desc_regional_pref_footer_learn_more" msgid="4401708653329230081">"Läs mer om språkinställningar."</string>
-    <!-- no translation found for metric_measurement_system (7489725697268321541) -->
-    <skip />
-    <!-- no translation found for us_measurement_system (8738587232938189052) -->
-    <skip />
-    <!-- no translation found for uk_measurement_system (4196897001775627597) -->
-    <skip />
+    <string name="metric_measurement_system" msgid="7489725697268321541">"Metersystemet"</string>
+    <string name="us_measurement_system" msgid="8738587232938189052">"Amerikanska måttsystemet"</string>
+    <string name="uk_measurement_system" msgid="4196897001775627597">"Brittiska måttsystemet"</string>
     <string name="category_title_terms_of_address" msgid="4309422700380895278">"Ytterligare inställningar"</string>
     <string name="terms_of_address_title" msgid="7338630812197476808">"Välj hur du vill bli tilltalad"</string>
     <string name="terms_of_address_summary" msgid="7802443422612600620">"Din enhet kan anpassa hur du tilltalas"</string>
@@ -4515,7 +4511,7 @@
     <string name="keywords_long_background_tasks" msgid="5788956269136054574">"långa uppgifter, dataöverföring, bakgrundsuppgifter"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Återställ anropsbegränsning för ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Anropsbegränsningen för ShortcutManager har återställts"</string>
-    <string name="notification_suggestion_title" msgid="6309263655965785411">"Kontrolluppgifter på låsskärm"</string>
+    <string name="notification_suggestion_title" msgid="6309263655965785411">"Styr vad som visas på låsskärmen"</string>
     <string name="notification_suggestion_summary" msgid="7615611244249276113">"Visa eller dölja innehåll i aviseringar"</string>
     <string name="page_tab_title_support" msgid="3235725053332345773">"Tips och support"</string>
     <string name="developer_smallest_width" msgid="632354817870920911">"Minsta bredd"</string>
@@ -5621,13 +5617,13 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Det gick inte att ställa in standardkontot"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Inget standardkonto har angetts"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Endast enheten"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Enhet och %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Lägg till ett konto för att komma igång"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Var du vill spara kontakter"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Circle to Search"</string>
     <string name="search_gesture_feature_summary" msgid="1793056495030564014">"Tryck länge på hemknappen eller navigeringshandtaget för att söka med innehållet på skärmen."</string>
-    <!-- no translation found for device_detail_icon_content_description (6699151424374841937) -->
-    <skip />
+    <string name="device_detail_icon_content_description" msgid="6699151424374841937">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Konfigurera enhetsinformation."</string>
     <string name="supervision_settings_title" msgid="8383827215386872736">"Kontroll"</string>
     <string name="supervision_settings_summary" msgid="5020634300370322741">"Innehållsbegränsningar och andra begränsningar"</string>
     <string name="device_supervision_switch_title" msgid="3203958797412413373">"Använd enhetskontroll"</string>
@@ -5637,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 274178f..9ed715a 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -2300,8 +2300,8 @@
     <string name="accessibility_tutorial_dialog_title_triple" msgid="5529704884360240365">"Njia ya mkato ya kugusa mara tatu"</string>
     <string name="accessibility_tutorial_dialog_title_two_finger_double" msgid="5749704453829390283">"Njia ya mkato ya kugusa mara mbili ukitumia vidole %1$d"</string>
     <string name="accessibility_tutorial_dialog_title_quick_setting" msgid="2905083277641794558">"Njia ya mkato ya Mipangilio ya Haraka"</string>
-    <string name="accessibility_tutorial_dialog_title_gesture" msgid="4541649734549409614">"Njia ya mkato ya ishara ya ufikivu"</string>
-    <string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="6800684770875867559">"Tumia ishara ya ufikivu"</string>
+    <string name="accessibility_tutorial_dialog_title_gesture" msgid="4541649734549409614">"Njia ya mkato ya mguso wa ufikivu"</string>
+    <string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="6800684770875867559">"Kutumia miguso ya ufikivu"</string>
     <string name="accessibility_tutorial_dialog_message_button" msgid="8977286776192770246">"Ili utumie kipengele hiki, gusa kitufe cha zana za ufikivu cha <xliff:g id="ACCESSIBILITY_ICON">%s</xliff:g> katika sehemu ya chini ya skrini yako.\n\nIli ubadili kati ya vipengele, gusa na ushikilie kitufe cha zana za ufikivu."</string>
     <string name="accessibility_tutorial_dialog_message_floating_button" msgid="6631371483819355514">"Ili utumie kipengele hiki, gusa kitufe cha zana za ufikivu kwenye skrini yako"</string>
     <string name="accessibility_tutorial_dialog_message_volume" msgid="3785791536286606664">"Ili utumie kipengele hiki, bonyeza na ushikilie vitufe vyote viwili vya sauti"</string>
@@ -2320,12 +2320,12 @@
     <string name="accessibility_tutorial_dialog_configure_software_shortcut_type" msgid="8041105223988170653">"Chaguo zaidi"</string>
     <string name="accessibility_shortcut_title" msgid="8125867833704517463">"Njia mkato ya <xliff:g id="SERVICE">%1$s</xliff:g>"</string>
     <string name="accessibility_shortcut_edit_summary_software" msgid="48978719406821294">"kitufe cha zana za ufikivu"</string>
-    <string name="accessibility_shortcut_edit_summary_software_gesture" msgid="7346399253904683940">"ishara ya ufikivu"</string>
+    <string name="accessibility_shortcut_edit_summary_software_gesture" msgid="7346399253904683940">"mguso wa ufikivu"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software_gesture" msgid="8078659880723370597">"Telezesha vidole viwili juu"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software_gesture_talkback" msgid="7422753388389160524">"Telezesha vidole vitatu juu"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software" msgid="6505512764022389951">"Kitufe cha zana za ufikivu"</string>
     <string name="accessibility_shortcut_edit_dialog_summary_floating_button" msgid="6266489864614886247">"Gusa kitufe kinachoelea"</string>
-    <string name="accessibility_shortcut_edit_dialog_title_software_by_gesture" msgid="4775049370625630546">"Ishara ya ufikivu"</string>
+    <string name="accessibility_shortcut_edit_dialog_title_software_by_gesture" msgid="4775049370625630546">"Mguso wa ufikivu"</string>
     <string name="accessibility_shortcut_edit_dialog_summary_software" msgid="8315934725362849788">"Gusa kitufe cha zana za ufikivu <xliff:g id="ACCESSIBILITY_ICON">%s</xliff:g> katika sehemu ya chini ya skrini yako. Ili ubadili kati ya vipengele, gusa na ushikilie kitufe cha zana za ufikivu."</string>
     <string name="accessibility_shortcut_edit_dialog_summary_gesture" msgid="2081123009255579884">"{count,plural, =1{Telezesha kidole kuanzia sehemu ya chini ya skrini yako kwenda juu. Ili ubadili kati ya vipengele, telezesha kidole juu na ushikilie.}other{Telezesha vidole # kuanzia sehemu ya chini ya skrini yako kwenda juu. Ili ubadili kati ya vipengele, telezesha vidole # juu na ushikilie.}}"</string>
     <string name="accessibility_shortcut_edit_dialog_summary_software_floating" msgid="4459254227203203324"><annotation id="link">"Chaguo zaidi"</annotation></string>
@@ -2356,7 +2356,7 @@
     <string name="accessibility_button_about_title" msgid="3581116105084067926">"Kuhusu kitufe cha zana za ufikivu"</string>
     <string name="accessibility_button_gesture_about_title" msgid="8468987303602865536">"Kuhusu ishara na kitufe cha zana za ufikivu"</string>
     <string name="accessibility_button_gesture_footer_learn_more_content_description" msgid="4144803517680297869">"Pata maelezo zaidi kuhusu ishara na kitufe cha zana za ufikivu"</string>
-    <string name="accessibility_button_intro" msgid="2601976470525277903">"Kutumia kitufe cha zana za ufikivu. Ishara haipatikani kwenye usogezaji kwa kutumia vitufe 3."</string>
+    <string name="accessibility_button_intro" msgid="2601976470525277903">"Kutumia kitufe cha zana za ufikivu. Miguso haipatikani kwenye usogezaji kwa kutumia vitufe 3."</string>
     <string name="accessibility_button_summary" msgid="8510939012631455831">"Fikia vipengele vya ufikivu haraka"</string>
     <string name="accessibility_button_gesture_description" msgid="1141723096904904336">"&lt;b&gt;Ili uanze&lt;/b&gt;&lt;br/&gt; {0,number,integer}. Nenda kwenye mipangilio ya ufikivu&lt;br/&gt; {1,number,integer}. Teua kipengele kisha uguse njia ya mkato&lt;br/&gt; {2,number,integer}. Chagua ikiwa ungependa kutumia kitufe au ishara kufikia kipengele&lt;br/&gt;"</string>
     <string name="accessibility_button_description" msgid="7669538706120092399">"&lt;b&gt;Ili uanze&lt;/b&gt;&lt;br/&gt; {0,number,integer}. Nenda kwenye mipangilio ya ufikivu&lt;br/&gt; {1,number,integer}. Teua kipengele kisha uguse njia ya mkato&lt;br/&gt; {2,number,integer}. Chagua kitufe ili ufikie kipengele&lt;br/&gt;"</string>
@@ -2974,7 +2974,7 @@
     <string name="sync_active" msgid="5787407579281739975">"Usawazishaji amilifu"</string>
     <string name="account_sync_settings_title" msgid="2684888109902800966">"Sawazisha"</string>
     <string name="sync_is_failing" msgid="6738004111400633331">"Kwa sasa usawazishaji una tatizo. Utarudi baada ya muda mfupi."</string>
-    <string name="add_account_label" msgid="7134707140831385869">"Ongeza akaunti"</string>
+    <string name="add_account_label" msgid="7134707140831385869">"Weka akaunti"</string>
     <string name="managed_profile_not_available_label" msgid="7500578232182547365">"Wasifu wa kazini bado haupatikani"</string>
     <string name="work_mode_label" msgid="4687734487641548872">"Programu za kazini"</string>
     <string name="remove_managed_profile_label" msgid="1294933737673830431">"Ondoa wasifu wa kazini"</string>
@@ -3001,7 +3001,7 @@
     <string name="preference_change_password_title" msgid="5465821666939825972">"Badilisha nenosiri"</string>
     <string name="header_account_settings" msgid="1189339410278750008">"Mipangilio ya akaunti"</string>
     <string name="remove_account_label" msgid="4169490568375358010">"Ondoa akaunti"</string>
-    <string name="header_add_an_account" msgid="3919151542338822661">"Ongeza akaunti"</string>
+    <string name="header_add_an_account" msgid="3919151542338822661">"Weka akaunti"</string>
     <string name="really_remove_account_title" msgid="253097435885652310">"Je, ungependa kuondoa akaunti?"</string>
     <string name="remove_account_failed" msgid="3709502163548900644">"Mabadiliko haya hayaruhusiwi na msimamizi wako"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Huwezi kusawazisha mwenyewe"</string>
@@ -4561,12 +4561,12 @@
     <string name="swipe_up_to_switch_apps_summary" msgid="1415457307836359560">"Ili ubadilishe programu, telezesha kidole juu kwenye kitufe cha Ukurasa wa mwanzo. Ili uone programu zote, telezesha kidole juu tena. Ili urudi nyuma, gusa kitufe cha kurudi nyuma."</string>
     <string name="emergency_settings_preference_title" msgid="6183455153241187148">"Usalama na dharura"</string>
     <string name="emergency_dashboard_summary" msgid="401033951074039302">"Simu ya dharura, maelezo ya matibabu, arifa"</string>
-    <string name="edge_to_edge_navigation_title" msgid="714427081306043819">"Usogezaji kwa kutumia ishara"</string>
+    <string name="edge_to_edge_navigation_title" msgid="714427081306043819">"Usogezaji kwa miguso"</string>
     <string name="edge_to_edge_navigation_summary" msgid="818109176611921504">"Ili uende kwenye skrini ya kwanza, telezesha kidole juu kutoka sehemu ya chini ya skrini. Ili ubadilishe programu, telezesha kidole juu kutoka sehemu ya chini ya skrini kisha ushikilie, halafu uachilie. Ili urudi nyuma, telezesha kidole kutoka ukingo wa kushoto au kulia."</string>
     <string name="legacy_navigation_title" msgid="7877402855994423727">"Usogezaji kwa kutumia vitufe 3"</string>
     <string name="legacy_navigation_summary" msgid="5905301067778326433">"Rudi nyuma, Skrini ya kwanza na ubadilishe programu ukitumia vitufe vilivyo sehemu ya chini ya skrini yako."</string>
     <string name="nav_tutorial_button_description" msgid="7195363082216233970">"Anza mafunzo ya usogezaji kwa kutumia ishara."</string>
-    <string name="keywords_system_navigation" msgid="3131782378486554934">"usogezaji kwenye mfumo, usogezaji kwa kutumia vitufe 2, usogezaji kwa kutumia vitufe 3, usogezaji kwa kutumia ishara, telezesha kidole"</string>
+    <string name="keywords_system_navigation" msgid="3131782378486554934">"usogezaji kwenye mfumo, usogezaji kwa kutumia vitufe 2, usogezaji kwa kutumia vitufe 3, usogezaji kwa kutumia miguso, telezesha kidole"</string>
     <string name="assistant_gesture_category_title" msgid="2478251256585807920">"Kiratibu dijitali"</string>
     <string name="assistant_corner_gesture_title" msgid="1895061522687002106">"Telezesha kidole ili uombe programu ya mratibu dijitali"</string>
     <string name="assistant_corner_gesture_summary" msgid="5012534700233017955">"Telezesha kidole juu kutoka kona ya chini ili uombe programu ya mratibu dijitali"</string>
@@ -4578,9 +4578,9 @@
     <string name="right_edge" msgid="1505309103265829121">"Ukingo wa kulia"</string>
     <string name="back_sensitivity_dialog_message" msgid="6638367716784103306">"Kiwango cha juu cha hisi kinaweza kukinzana na ishara zozote za programu kwenye kingo za skrini."</string>
     <string name="back_sensitivity_dialog_title" msgid="6153608904168908264">"Hisi za Nyuma"</string>
-    <string name="gesture_settings_activity_title" msgid="1882463161833981820">"Usogezaji kwa Kutumia Ishara"</string>
+    <string name="gesture_settings_activity_title" msgid="1882463161833981820">"Usogezaji kwa Kutumia Miguso"</string>
     <string name="button_navigation_settings_activity_title" msgid="7335636045504461813">"Usogezaji kwa kutumia kitufe"</string>
-    <string name="keywords_gesture_navigation_settings" msgid="667561222717238931">"usogezaji kwa kutumia ishara, kiwango cha hisi ya nyuma, ishara ya nyuma"</string>
+    <string name="keywords_gesture_navigation_settings" msgid="667561222717238931">"usogezaji kwa miguso, kiwango cha hisi ya nyuma, mguso wa nyuma"</string>
     <string name="keywords_button_navigation_settings" msgid="7888812253110553920">"usogezaji, kitufe cha ukurasa wa mwanzo"</string>
     <string name="one_handed_title" msgid="2584414010282746195">"Hali ya kutumia kwa mkono mmoja"</string>
     <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Tumia hali ya kutumia kwa mkono mmoja"</string>
@@ -5610,14 +5610,15 @@
     <string name="audio_streams_qr_code_help_with_link" msgid="5542328067190486479"><annotation id="link">"Je, unahitaji usaidizi?"</annotation></string>
     <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>
+    <string name="contacts_storage_settings_title" msgid="1574030546525203810">"Kuhifadhi anwani"</string>
     <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_set_default_account_error_message" msgid="849847649756411393">"Hitilafu imetokea wakati wa kuweka akaunti chaguomsingi"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Hujaweka akaunti chaguomsingi"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Kifaa tu"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Kifaa na %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Weka akaunti ili uanze"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Mahali pa kuhifadhi anwani"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Chora Mviringo ili Kutafuta"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 23fbe40..d9bb67e 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -2067,7 +2067,7 @@
     <string name="trackpad_reverse_scrolling_title" msgid="422877284529360866">"தலைகீழாக நகர்த்துதல்"</string>
     <string name="trackpad_reverse_scrolling_summary" msgid="6048648562887499036">"கீழ்நோக்கி நகர்த்தும்போது உள்ளடக்கம் மேலே செல்லும்"</string>
     <string name="trackpad_bottom_right_tap_title" msgid="230337692279220068">"கீழ்வலது மூலையில் கிளிக் செய்தல்"</string>
-    <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"மேலும் விருப்பங்களுக்கு டச்பேடின் கீழ்வலது மூலையில் தட்டுக"</string>
+    <string name="trackpad_bottom_right_tap_summary" msgid="4467915480282133447">"மேலும் விருப்பங்களுக்கு டச்பேடின் கீழ்வலது மூலையில் தட்டவும்"</string>
     <string name="trackpad_pointer_speed" msgid="5672221910698079303">"கர்சர் வேகம்"</string>
     <string name="three_finger_tap_preference_title" msgid="2114347152933865780">"3 விரல் தட்டலைப் பிரத்தியேகமாக்குதல்"</string>
     <string name="touchpad_acceleration_title" msgid="176627555191021888">"டச்பேட் ஆக்ஸிலரேஷன்"</string>
@@ -3719,7 +3719,7 @@
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"லாக்ஸ்கிரீனில் அறிவிப்புகள்"</string>
     <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"உரையாடல்கள், இயல்புநிலை &amp; ஒலியில்லா அறிவிப்புகளைக் காட்டும்"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"உரையாடல், இயல்புநிலை மற்றும் ஒலியில்லா அறிவிப்புகளைக் காட்டு"</string>
-    <string name="lock_screen_notifs_show_alerting" msgid="6584682657382684566">"ஒலியில்லாத உரையாடல்களையும் அறிவிப்புகளையும் மறைக்கவும்"</string>
+    <string name="lock_screen_notifs_show_alerting" msgid="6584682657382684566">"ஒலியில்லாத உரையாடல்களையும் அறிவிப்புகளையும் மறைக்கலாம்"</string>
     <string name="lock_screen_notifs_show_none" msgid="1941044980403067101">"எந்த அறிவிப்புகளையும் காட்டாதே"</string>
     <string name="lock_screen_notifs_redact" msgid="9024158855454642296">"சென்சிட்டிவான அறிவிப்புகள்"</string>
     <string name="lock_screen_notifs_redact_summary" msgid="1395483766035470612">"பாதுகாக்க வேண்டிய விவரங்களைப் பூட்டப்பட்டிருந்தாலும் காட்டும்"</string>
@@ -3825,8 +3825,8 @@
     <string name="notif_listener_more_settings" msgid="1348409392307208921">"கூடுதல் அமைப்புகள்"</string>
     <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">"குறுகிய காலத்தில் பல அறிவிப்புகளைப் பெறும்போது, 2 நிமிடங்கள் வரை உங்கள் சாதனம் அதன் ஒலியளவைக் குறைத்து விழிப்பூட்டல்கள் பெறுவதை நிறுத்திவைக்கும். அழைப்புகள், அலாரங்கள் மற்றும் முக்கியமான உரையாடல்கள் பாதிக்கப்படாது. \n\nதிரையின் மேலிருந்து கீழே இழுப்பதன் மூலம் குறைந்த ஒலியளவில் இருக்கும்போது பெற்ற அறிவிப்புகளைப் பார்க்கலாம்."</string>
+    <string name="notification_polite_main_control_title" msgid="5812529809151927149">"அறிவிப்புக்கான கூல்டவுனைப் பயன்படுத்துதல்"</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="notification_bundle_title" msgid="460988459835922719">"தொகுக்கப்பட்ட அறிவிப்புகள்"</string>
@@ -5613,11 +5613,12 @@
     <string name="contacts_storage_settings_title" msgid="1574030546525203810">"தொடர்புகள் சேமிப்பகம்"</string>
     <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_selection_message" msgid="8082077300632059003">"இயல்பாகவே தொடர்புகள் உங்கள் சாதனத்தில் சேமிக்கப்பட்டு உங்கள் கணக்குடன் ஒத்திசைக்கப்படும்"</string>
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"இயல்புக் கணக்கை அமைப்பதில் பிழை"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"இயல்புக் கணக்கு அமைக்கப்படவில்லை"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"சாதனம் மட்டும்"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"சாதனம் மற்றும் %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"தொடங்குவதற்கு ஒரு கணக்கைச் சேருங்கள்"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"தொடர்புகளைச் சேமிக்கும் இடம்"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"வட்டமிட்டுத் தேடல்"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 5a5b98e..bc172b7 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -2470,8 +2470,7 @@
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"స్క్రీన్‌పై మూడు సార్ల నొక్కడం"</string>
     <string name="accessibility_shortcut_edit_screen_title" msgid="4494142067760961499">"యాక్సెసిబిలిటీ షార్ట్‌కట్‌లను ఎడిట్ చేయండి"</string>
     <string name="accessibility_shortcut_edit_screen_prompt" msgid="5966054283114856682">"%1$s కోసం మీ షార్ట్‌కట్‌ను ఎంచుకోండి"</string>
-    <!-- no translation found for accessibility_shortcut_unassigned_setting_unavailable_summary (993486098872935043) -->
-    <skip />
+    <string name="accessibility_shortcut_unassigned_setting_unavailable_summary" msgid="993486098872935043">"దీన్ని ఉపయోగించడానికి, యాక్సెసిబిలిటీ ఫీచర్ పేజీలో %1$s షార్ట్‌కట్‌ను ఆన్ చేయండి"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"కొనసాగించండి"</string>
     <string name="accessibility_hearingaid_title" msgid="1263619711863375614">"వినికిడి పరికరాలు"</string>
     <string name="accessibility_hearingaid_intro" msgid="6686620444104350629">"ASHA, LE ఆడియో వినికిడి పరికరాలు, కోక్లియర్ ఇంప్లాంట్‌లు, అలాగే ఇతర యాంప్లిఫికేషన్ పరికరాలను సెటప్ చేసి, మేనేజ్ చేయండి"</string>
@@ -5617,7 +5616,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"ఆటోమేటిక్ ఖాతాను సెట్ చేయడంలో ఎర్రర్ ఏర్పడింది"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"ఆటోమేటిక్ సెట్టింగ్ సెట్ చేయబడలేదు"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"పరికరం మాత్రమే"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"పరికరం, %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"ప్రారంభించడానికి ఒక ఖాతాను జోడించండి"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"కాంటాక్ట్‌లను ఎక్కడ సేవ్ చేయాలి"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"సెర్చ్ చేయడానికి సర్కిల్ గీయండి"</string>
@@ -5628,8 +5628,8 @@
     <string name="device_supervision_switch_title" msgid="3203958797412413373">"పరికర పర్యవేక్షణను ఉపయోగించండి"</string>
     <string name="device_supervision_switch_no_pin_summary" msgid="8294396978464347129">"ప్రారంభించడానికి PINను సెటప్ చేయండి"</string>
     <string name="keywords_supervision_settings" msgid="2580555201483955376">"పర్యవేక్షణ, తల్లిదండ్రుల పర్యవేక్షణ, తల్లిదండ్రుల కంట్రోల్స్"</string>
-    <!-- no translation found for supervision_pin_management_preference_title (961680798581006465) -->
-    <skip />
-    <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
+    <string name="supervision_pin_management_preference_title" msgid="961680798581006465">"PINను మేనేజ్ చేయండి"</string>
+    <string name="supervision_pin_management_preference_summary_add" msgid="3244161328612671896">"PIN రికవరీ పద్ధతిని జోడించండి"</string>
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
     <skip />
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 73a1411..4c13dc9 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -2470,8 +2470,7 @@
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"แตะหน้าจอ 3 ครั้ง"</string>
     <string name="accessibility_shortcut_edit_screen_title" msgid="4494142067760961499">"แก้ไขทางลัดสำหรับการช่วยเหลือพิเศษ"</string>
     <string name="accessibility_shortcut_edit_screen_prompt" msgid="5966054283114856682">"เลือกแป้มพิมพ์ลัดสำหรับ %1$s"</string>
-    <!-- no translation found for accessibility_shortcut_unassigned_setting_unavailable_summary (993486098872935043) -->
-    <skip />
+    <string name="accessibility_shortcut_unassigned_setting_unavailable_summary" msgid="993486098872935043">"หากต้องการใช้ฟีเจอร์นี้ ให้เปิดทางลัด %1$s ในหน้าฟีเจอร์การช่วยเหลือพิเศษ"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"ต่อไป"</string>
     <string name="accessibility_hearingaid_title" msgid="1263619711863375614">"เครื่องช่วยฟัง"</string>
     <string name="accessibility_hearingaid_intro" msgid="6686620444104350629">"ตั้งค่าและจัดการเครื่องช่วยฟังของ ASHA และ LE Audio, ประสาทหูเทียม และอุปกรณ์ขยายเสียงอื่นๆ"</string>
@@ -5617,7 +5616,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"เกิดข้อผิดพลาดในการตั้งค่าบัญชีเริ่มต้น"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"ไม่ได้ตั้งค่าบัญชีเริ่มต้น"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"อุปกรณ์เท่านั้น"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"อุปกรณ์และ %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"เพิ่มบัญชีเพื่อเริ่มต้นใช้งาน"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"ตำแหน่งที่จะบันทึกรายชื่อติดต่อ"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"วงเพื่อค้นหา"</string>
@@ -5628,8 +5628,8 @@
     <string name="device_supervision_switch_title" msgid="3203958797412413373">"ใช้การควบคุมดูแลอุปกรณ์"</string>
     <string name="device_supervision_switch_no_pin_summary" msgid="8294396978464347129">"ตั้งค่า PIN เพื่อเริ่มต้นใช้งาน"</string>
     <string name="keywords_supervision_settings" msgid="2580555201483955376">"การควบคุมดูแล การควบคุมดูแลโดยผู้ปกครอง การควบคุมโดยผู้ปกครอง"</string>
-    <!-- no translation found for supervision_pin_management_preference_title (961680798581006465) -->
-    <skip />
-    <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
+    <string name="supervision_pin_management_preference_title" msgid="961680798581006465">"จัดการ PIN"</string>
+    <string name="supervision_pin_management_preference_summary_add" msgid="3244161328612671896">"เพิ่มวิธีการกู้คืน PIN"</string>
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
     <skip />
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 09bd9c1..95f18a7 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -2470,8 +2470,7 @@
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"I-triple tap ang screen"</string>
     <string name="accessibility_shortcut_edit_screen_title" msgid="4494142067760961499">"I-edit ang mga shortcut sa accessibility"</string>
     <string name="accessibility_shortcut_edit_screen_prompt" msgid="5966054283114856682">"Piliin ang iyong shortcut para sa %1$s"</string>
-    <!-- no translation found for accessibility_shortcut_unassigned_setting_unavailable_summary (993486098872935043) -->
-    <skip />
+    <string name="accessibility_shortcut_unassigned_setting_unavailable_summary" msgid="993486098872935043">"Para magamit ito, i-on ang shortcut na %1$s sa page ng feature ng accessibility"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"Magpatuloy"</string>
     <string name="accessibility_hearingaid_title" msgid="1263619711863375614">"Mga hearing device"</string>
     <string name="accessibility_hearingaid_intro" msgid="6686620444104350629">"Mag-set up at mamahala ng mga ASHA at LE Audio na hearing aid, cochlear implant, at iba pang amplification device"</string>
@@ -5617,7 +5616,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Nagka-error sa pagtatakda ng default na account"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Walang itinakdang default"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Device lang"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Device at %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Magdagdag ng account para magsimula"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Saan ise-save ang mga contact"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Circle to Search"</string>
@@ -5628,8 +5628,8 @@
     <string name="device_supervision_switch_title" msgid="3203958797412413373">"Gamitin ang pamamahala sa device"</string>
     <string name="device_supervision_switch_no_pin_summary" msgid="8294396978464347129">"I-set up ang PIN para makapagsimula"</string>
     <string name="keywords_supervision_settings" msgid="2580555201483955376">"pamamahala, pamamahala ng magulang, parental controls"</string>
-    <!-- no translation found for supervision_pin_management_preference_title (961680798581006465) -->
-    <skip />
-    <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
+    <string name="supervision_pin_management_preference_title" msgid="961680798581006465">"Pamahalaan ang PIN"</string>
+    <string name="supervision_pin_management_preference_summary_add" msgid="3244161328612671896">"Magdagdag ng paraan ng pag-recover ng PIN"</string>
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
     <skip />
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 1c8f0f6..3d3e853 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -610,7 +610,7 @@
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Parmağınızı kaldırın ve sensöre tekrar dokunun"</string>
     <string name="security_settings_fingerprint_bad_calibration_title" msgid="3073145395701953620">"Parmak izi sensörü kullanılamıyor"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="304585658839584958">"Bir onarım hizmeti sağlayıcıyı ziyaret edin."</string>
-    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Ekran Kapalıyken Parmak İzi Kilidi ile Kilit Açma"</string>
+    <string name="security_settings_screen_off_unlock_udfps_title" msgid="3862344421345708607">"Ekran Kapalıyken Parmak İzi Kilidi ile Kilit Aç"</string>
     <string name="security_settings_screen_off_unlock_udfps_description" msgid="6950375823241861147">"Parmak İzi Kilidi\'ni ekran kapalıyken de kullanın"</string>
     <string name="security_settings_screen_off_unlock_udfps_keywords" msgid="7550893353934831569">"Ekran kapalı, Kilidi aç"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Daha fazla güvenlik ayarı"</string>
@@ -1758,7 +1758,7 @@
     <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"İş PIN\'inizi girin"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Şifreler eşleşmiyor"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN\'ler eşleşmiyor"</string>
-    <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Deseninizi tekrar çizin."</string>
+    <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Deseninizi tekrar çizin"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="5669348379247148696">"Kilit açma seçeneği"</string>
     <string name="lockpassword_password_set_toast" msgid="6615759749393973795">"Şifre ayarlandı"</string>
     <string name="lockpassword_pin_set_toast" msgid="5415783847198570890">"PIN ayarlandı"</string>
@@ -4565,7 +4565,7 @@
     <string name="edge_to_edge_navigation_title" msgid="714427081306043819">"Hareketle gezinme"</string>
     <string name="edge_to_edge_navigation_summary" msgid="818109176611921504">"Ana sayfaya gitmek için ekranın altından yukarı kaydırın. Uygulamalar arasında geçiş yapmak için ekranın altından yukarı kaydırın, tutun ve sonra bırakın. Geri gitmek için ekranın sol veya sağ kenarından kaydırın."</string>
     <string name="legacy_navigation_title" msgid="7877402855994423727">"3 düğmeli gezinme"</string>
-    <string name="legacy_navigation_summary" msgid="5905301067778326433">"Geri gitme, Ana sayfaya gitme ve uygulamalar arasında geçiş yapma işlemleri için ekranınızın altındaki simgeleri kullanın."</string>
+    <string name="legacy_navigation_summary" msgid="5905301067778326433">"Geri gitme, ana sayfaya gitme ve uygulamalar arasında geçiş yapma işlemleri için ekranınızın altındaki simgeleri kullanın."</string>
     <string name="nav_tutorial_button_description" msgid="7195363082216233970">"Hareketle gezinme eğitimini başlat."</string>
     <string name="keywords_system_navigation" msgid="3131782378486554934">"sistemde gezinme, 2 düğmeli gezinme, 3 düğmeli gezinme, hareketle gezinme, kaydırma"</string>
     <string name="assistant_gesture_category_title" msgid="2478251256585807920">"Dijital asistan"</string>
@@ -5618,7 +5618,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Varsayılan hesap ayarlanırken hata oluştu"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Varsayılan ayar yok"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Yalnızca cihaz"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Cihaz ve %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Başlamak için hesap ekleyin"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Kişilerin kaydedileceği yer"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Seçerek Arat"</string>
@@ -5633,4 +5634,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 8ab0d9a..3e19de3 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -5619,7 +5619,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Не вдалося налаштувати обліковий запис за умовчанням"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Немає облікового запису за умовчанням"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Лише на пристрої"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Пристрій і %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Щоб почати, додайте обліковий запис"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Де зберігати контакти"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Обвести й знайти"</string>
@@ -5634,4 +5635,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 4d0732b..b6b7319 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"ڈیفالٹ اکاؤنٹ کو ترتیب دینے میں خرابی"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"کوئی ڈیفالٹ سیٹ نہیں ہے"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"صرف آلہ"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"‏آلہ اور ‎%1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"شروع کرنے کیلئے ایک اکاؤنٹ شامل کریں"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"رابطوں کو کہاں محفوظ کرنا ہے"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"تلاش کرنے کیلئے دائرہ بنائیں"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 9aae152..be5bb4a 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Birlamchi hisob tanlanmadi"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Birlamchi hisob tanlanmagan"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Faqat qurilmada"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Qurilma va %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Avval hisob qoʻshing"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Kontaktlar qayerda saqlansin"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Chizib qidirish"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 02ec624..0839e25 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Đã xảy ra lỗi khi đặt tài khoản mặc định"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Chưa đặt tài khoản mặc định nào"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Chỉ thiết bị"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Thiết bị và %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Thêm một tài khoản để bắt đầu"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Vị trí lưu thông tin liên hệ"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Khoanh tròn để tìm kiếm"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index a1d3292..d97cf07 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1789,10 +1789,10 @@
     <string name="lockpassword_confirm_your_password_header_frp" msgid="7932240547542564033">"验证密码"</string>
     <string name="lockpassword_remote_validation_header" msgid="4992647285784962073">"验证身份"</string>
     <string name="lockpassword_remote_validation_pattern_details" msgid="4655537780358707983">"如需转移 Google 账号、设置等，请绘制其他设备的解锁图案。您的解锁图案已经过加密。"</string>
-    <string name="lockpassword_remote_validation_pin_details" msgid="2373654227583206297">"如需转移 Google 账号、设置等，请输入其他设备的 PIN 码。您的 PIN 码已经过加密。"</string>
+    <string name="lockpassword_remote_validation_pin_details" msgid="2373654227583206297">"如需转移 Google 账号、设置等，请输入其他设备的 PIN 码。您的 PIN 码会经过加密。"</string>
     <string name="lockpassword_remote_validation_password_details" msgid="3482328925925888340">"如需转移 Google 账号、设置等，请输入其他设备的密码。您的密码已经过加密。"</string>
     <string name="lockpassword_remote_validation_set_pattern_as_screenlock" msgid="7595104317648465901">"还使用解锁图案来解锁此设备"</string>
-    <string name="lockpassword_remote_validation_set_pin_as_screenlock" msgid="509672303005547218">"还使用 PIN 码来解锁此设备"</string>
+    <string name="lockpassword_remote_validation_set_pin_as_screenlock" msgid="509672303005547218">"解锁此设备时也使用 PIN 码"</string>
     <string name="lockpassword_remote_validation_set_password_as_screenlock" msgid="2066701840753591922">"还使用密码来解锁此设备"</string>
     <string name="lockpassword_confirm_repair_mode_pattern_header" msgid="6669435143987988314">"验证图案"</string>
     <string name="lockpassword_confirm_repair_mode_pin_header" msgid="2585263648322879131">"验证 PIN 码"</string>
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"设置默认账号时出错"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"未设置默认账号"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"仅限设备"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"设备和%1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"添加账号即可开始"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"联系人信息保存位置"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"圈定即搜"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index b24a198..b542d63 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"設定預設帳戶時發生錯誤"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"沒有預設帳戶"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"只限裝置"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"裝置和 %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"新增帳戶以開始使用"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"聯絡人的儲存位置"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"一圈即搜"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index ceb3089..7243522 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -5617,7 +5617,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"設定預設帳戶時發生錯誤"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"沒有預設帳戶"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"僅限裝置"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"裝置和 %1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"如要開始使用，請新增帳戶"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"聯絡人的儲存位置"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"畫圈搜尋"</string>
@@ -5632,4 +5633,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 9e5ac8c..c9cf4eb 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -5618,7 +5618,8 @@
     <string name="contacts_storage_set_default_account_error_message" msgid="849847649756411393">"Iphutha ekusetheni i-akhawunti ezenzekelayo"</string>
     <string name="contacts_storage_no_account_set_summary" msgid="7454973781666475276">"Ayikho isethi ezenzekelayo"</string>
     <string name="contacts_storage_local_account_summary" msgid="5034805108128685712">"Idivayisi kuphela"</string>
-    <string name="contacts_storage_account_title" msgid="4939024280942927810">"Idivayisi ne-%1$s"</string>
+    <!-- no translation found for contacts_storage_account_title (7334522539665856395) -->
+    <skip />
     <string name="contacts_storage_first_time_add_account_message" msgid="5161093169928132323">"Faka i-akhawunti ukuze uqalise"</string>
     <string name="contacts_storage_account_category_title" msgid="6427149157377815586">"Lapho ugcina khona oxhumana nabo"</string>
     <string name="search_gesture_feature_title" msgid="7037117019612710960">"Khethela Ukusesha"</string>
@@ -5633,4 +5634,6 @@
     <skip />
     <!-- no translation found for supervision_pin_management_preference_summary_add (3244161328612671896) -->
     <skip />
+    <!-- no translation found for supervision_change_pin_preference_title (2288584039438231801) -->
+    <skip />
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4727c40..c6f7909 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -914,6 +914,14 @@
     <string name="security_settings_face_enroll_improve_face_alert_body_fingerprint">Delete your current face model to set up Face Unlock again.\n\nYour face model will be permanently and securely deleted.\n\nAfter deletion, you will need your fingerprint, PIN, pattern, or password to unlock your phone or for authentication in apps.</string>
     <!-- Title for a category shown for the face settings page. [CHAR LIMIT=20] -->
     <string name="security_settings_face_settings_use_face_category">Use Face Unlock for</string>
+    <!-- Description shown on face settings page. -->
+    <string name="security_settings_face_description"></string>
+    <!-- Footer description shown on face settings page. -->
+    <string name="security_settings_face_footer_description_class3"></string>
+    <!-- Footer learn more description shown on face settings page. -->
+    <string name="security_settings_face_footer_learn_more_description"></string>
+    <!-- Footer learn more URL shown on face settings page  [DO NOT TRANSLATE] -->
+    <string name="security_settings_face_footer_learn_more_url" translatable="false"></string>
     <!-- Title for a category shown for the face settings page. [CHAR LIMIT=20] -->
     <string name="security_settings_face_settings_face_category">Face</string>
     <!-- Title for a category shown for the face settings page. [CHAR LIMIT=20] -->
@@ -948,6 +956,8 @@
     <string name="security_settings_face_remove_dialog_details_fingerprint_conv">Your face model will be permanently and securely deleted.\n\nAfter deletion, you will need your fingerprint, PIN, pattern, or password to unlock your phone.</string>
     <!-- Subtitle shown for contextual setting face enrollment [CHAR LIMIT=NONE] -->
     <string name="security_settings_face_settings_context_subtitle">Use Face Unlock to unlock your phone</string>
+    <!-- Title shown for adding face in face settings page. -->
+    <string name="security_settings_face_add">Add face</string>
 
     <!-- Fingerprint enrollment and settings --><skip />
     <!-- Note: Update FingerprintEnrollParentalConsent.CONSENT_STRING_RESOURCES when any _consent_ strings are added or removed. -->
@@ -14123,4 +14133,6 @@
     <string name="supervision_pin_management_preference_summary_add">Add a PIN recovery method</string>
     <!-- Title for supervision change PIN setting entry [CHAR LIMIT=60] -->
     <string name="supervision_change_pin_preference_title">Change PIN</string>
+    <!-- Title for supervision forgot PIN setting entry [CHAR LIMIT=60] -->
+    <string name="supervision_add_forgot_pin_preference_title">Forgot PIN</string>
 </resources>
diff --git a/res/xml/lock_screen_notifications_settings.xml b/res/xml/lock_screen_notifications_settings.xml
index 52ae18f..30017e9 100644
--- a/res/xml/lock_screen_notifications_settings.xml
+++ b/res/xml/lock_screen_notifications_settings.xml
@@ -30,12 +30,14 @@
         android:key="compact_illustration"
         settings:searchable="false"
         android:selectable="false"
+        settings:lottie_rawRes="@raw/lottie_lock_screen_notification_minimalism_compact_view"
         settings:dynamicColor="true"/>
 
     <com.android.settingslib.widget.IllustrationPreference
         android:key="full_list_illustration"
         settings:searchable="false"
         android:selectable="false"
+        settings:lottie_rawRes="@raw/lottie_lock_screen_notification_minimalism_full_list"
         settings:dynamicColor="true"/>
 
     <com.android.settingslib.widget.LayoutPreference
diff --git a/res/xml/security_settings_face.xml b/res/xml/security_settings_face.xml
index e32148c..41d535f 100644
--- a/res/xml/security_settings_face.xml
+++ b/res/xml/security_settings_face.xml
@@ -19,6 +19,11 @@
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/security_settings_face_preference_title">
 
+    <com.android.settingslib.widget.TopIntroPreference
+        android:key="security_settings_face_description"
+        settings:searchable="false"
+        settings:isPreferenceVisible="false" />
+
     <PreferenceCategory
         android:key="biometric_settings_use_face_to"
         android:title="@string/security_settings_face_settings_use_face_to_category"
@@ -38,6 +43,18 @@
     </PreferenceCategory>
 
     <PreferenceCategory
+        android:key="security_settings_face_enrolled_category"
+        android:title="@string/security_settings_face_preference_title_new"
+        settings:isPreferenceVisible="false">
+        <com.android.settings.biometrics.face.FacePreference
+            android:key="security_settings_face_remove"
+            android:title="@string/security_settings_face_preference_title_new"/>
+        <Preference
+            android:key="security_settings_face_enroll"
+            android:title="@string/security_settings_face_add"/>
+    </PreferenceCategory>
+
+    <PreferenceCategory
         android:key="security_settings_face_unlock_category"
         android:title="@string/security_settings_face_settings_use_face_category"
         settings:controller="com.android.settings.biometrics.face.FaceUnlockCategoryPreferenceController">
@@ -88,13 +105,15 @@
         android:key="security_settings_face_delete_faces_container"
         android:title="@string/security_settings_face_settings_remove_face_model"
         android:selectable="false"
-        android:layout="@layout/face_remove_button"/>
+        android:layout="@layout/face_remove_button"
+        settings:isPreferenceVisible="false"/>
 
     <com.android.settingslib.widget.LayoutPreference
         android:key="security_settings_face_enroll_faces_container"
         android:title="@string/security_settings_face_settings_enroll"
         android:selectable="false"
-        android:layout="@layout/face_enroll_button"/>
+        android:layout="@layout/face_enroll_button"
+        settings:isPreferenceVisible="false"/>
 
     <com.android.settingslib.widget.FooterPreference
         android:key="security_face_footer"
diff --git a/src/com/android/settings/biometrics/face/FaceFeatureProvider.java b/src/com/android/settings/biometrics/face/FaceFeatureProvider.java
index d38ce6d..089f2c2 100644
--- a/src/com/android/settings/biometrics/face/FaceFeatureProvider.java
+++ b/src/com/android/settings/biometrics/face/FaceFeatureProvider.java
@@ -42,4 +42,13 @@
     default FaceEnrollActivityClassProvider getEnrollActivityClassProvider() {
         return FaceEnrollActivityClassProvider.getInstance();
     }
+
+    /**
+     * Gets the feature provider for FaceSettings page
+     * @return the provider
+     */
+    @NonNull
+    default FaceSettingsFeatureProvider getFaceSettingsFeatureProvider() {
+        return FaceSettingsFeatureProvider.getInstance();
+    }
 }
diff --git a/src/com/android/settings/biometrics/face/FacePreference.java b/src/com/android/settings/biometrics/face/FacePreference.java
new file mode 100644
index 0000000..55274af
--- /dev/null
+++ b/src/com/android/settings/biometrics/face/FacePreference.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2025 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.biometrics.face;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.settings.R;
+import com.android.settingslib.widget.TwoTargetPreference;
+
+public class FacePreference extends TwoTargetPreference {
+
+    public FacePreference(@NonNull Context context) {
+        super(context);
+    }
+
+    public FacePreference(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public FacePreference(
+            @NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public FacePreference(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr,
+            int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    @Override
+    protected int getSecondTargetResId() {
+        return R.layout.preference_widget_delete;
+    }
+}
diff --git a/src/com/android/settings/biometrics/face/FaceSettings.java b/src/com/android/settings/biometrics/face/FaceSettings.java
index 6263bc5..d2e2a80 100644
--- a/src/com/android/settings/biometrics/face/FaceSettings.java
+++ b/src/com/android/settings/biometrics/face/FaceSettings.java
@@ -30,6 +30,7 @@
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.ResourceId;
 import android.hardware.face.FaceManager;
 import android.os.Bundle;
 import android.os.UserHandle;
@@ -73,12 +74,19 @@
     private static final String KEY_BIOMETRICS_SUCCESSFULLY_AUTHENTICATED =
             "biometrics_successfully_authenticated";
 
+    private static final String PREF_KEY_FACE_DESCRIPTION = "security_settings_face_description";
     private static final String PREF_KEY_DELETE_FACE_DATA =
             "security_settings_face_delete_faces_container";
     private static final String PREF_KEY_ENROLL_FACE_UNLOCK =
             "security_settings_face_enroll_faces_container";
     private static final String PREF_KEY_USE_FACE_TO_CATEGORY =
             "biometric_settings_use_face_to";
+    private static final String PREF_KEY_FACE_ENROLLED_CATEGORY =
+            "security_settings_face_enrolled_category";
+    private static final String PREF_KEY_FACE_REMOVE =
+            "security_settings_face_remove";
+    private static final String PREF_KEY_FACE_ENROLL =
+            "security_settings_face_enroll";
     public static final String SECURITY_SETTINGS_FACE_MANAGE_CATEGORY =
             "security_settings_face_manage_category";
 
@@ -98,6 +106,9 @@
     private List<Preference> mTogglePreferences;
     private Preference mRemoveButton;
     private Preference mEnrollButton;
+    private PreferenceCategory mFaceEnrolledCategory;
+    private Preference mFaceRemoveButton;
+    private Preference mFaceEnrollButton;
     private FaceFeatureProvider mFaceFeatureProvider;
 
     private boolean mConfirmingPassword;
@@ -111,8 +122,7 @@
         }
 
         // Hide the "remove" button and show the "set up face authentication" button.
-        mRemoveButton.setVisible(false);
-        mEnrollButton.setVisible(true);
+        updateFaceAddAndRemovePreference(false);
     };
 
     private final FaceSettingsEnrollButtonPreferenceController.Listener mEnrollListener = intent ->
@@ -193,6 +203,15 @@
                 : use(FaceSettingsLockscreenBypassPreferenceController.class);
         mLockscreenController.setUserId(mUserId);
 
+        final int descriptionResId = FeatureFactory.getFeatureFactory()
+                .getFaceFeatureProvider().getFaceSettingsFeatureProvider()
+                .getSettingPageDescription();
+        if (ResourceId.isValid(descriptionResId)) {
+            final Preference preference = findPreference(PREF_KEY_FACE_DESCRIPTION);
+            preference.setTitle(descriptionResId);
+            preference.setVisible(true);
+        }
+
         final PreferenceCategory managePref =
                 findPreference(SECURITY_SETTINGS_FACE_MANAGE_CATEGORY);
         Preference keyguardPref = findPreference(FaceSettingsKeyguardPreferenceController.KEY);
@@ -201,8 +220,13 @@
         Preference confirmPref = findPreference(FaceSettingsConfirmPreferenceController.KEY);
         Preference bypassPref =
                 findPreference(mLockscreenController.getPreferenceKey());
+        Preference unlockKeyguard = findPreference(
+                use(FaceSettingsKeyguardUnlockPreferenceController.class).getPreferenceKey());
+        Preference appsPref = findPreference(
+                use(FaceSettingsAppsPreferenceController.class).getPreferenceKey());
         mTogglePreferences = new ArrayList<>(
-                Arrays.asList(keyguardPref, appPref, attentionPref, confirmPref, bypassPref));
+                Arrays.asList(keyguardPref, appPref, attentionPref, confirmPref, bypassPref,
+                        unlockKeyguard, appsPref));
 
         if (RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
                 getContext(), DevicePolicyManager.KEYGUARD_DISABLE_FACE, mUserId) != null) {
@@ -215,9 +239,18 @@
         mRemoveButton = findPreference(FaceSettingsRemoveButtonPreferenceController.KEY);
         mEnrollButton = findPreference(FaceSettingsEnrollButtonPreferenceController.KEY);
 
+        mFaceEnrolledCategory = findPreference(PREF_KEY_FACE_ENROLLED_CATEGORY);
+        mFaceRemoveButton = findPreference(PREF_KEY_FACE_REMOVE);
+        mFaceRemoveButton.setIcon(R.drawable.ic_face);
+        mFaceRemoveButton.setOnPreferenceClickListener(
+                use(FaceSettingsRemoveButtonPreferenceController.class));
+        mFaceEnrollButton = findPreference(PREF_KEY_FACE_ENROLL);
+        mFaceEnrollButton.setIcon(R.drawable.ic_add_24dp);
+        mFaceEnrollButton.setOnPreferenceClickListener(
+                use(FaceSettingsEnrollButtonPreferenceController.class));
+
         final boolean hasEnrolled = mFaceManager.hasEnrolledTemplates(mUserId);
-        mEnrollButton.setVisible(!hasEnrolled);
-        mRemoveButton.setVisible(hasEnrolled);
+        updateFaceAddAndRemovePreference(hasEnrolled);
 
         // There is no better way to do this :/
         for (AbstractPreferenceController controller : mControllers) {
@@ -255,8 +288,7 @@
     public void onStart() {
         super.onStart();
         final boolean hasEnrolled = mFaceManager.hasEnrolledTemplates(mUserId);
-        mEnrollButton.setVisible(!hasEnrolled);
-        mRemoveButton.setVisible(hasEnrolled);
+        updateFaceAddAndRemovePreference(hasEnrolled);
 
         // When the user has face id registered but failed enrolling in device lock state,
         // lead users directly to the confirm deletion dialog in Face Unlock settings.
@@ -264,10 +296,16 @@
             final boolean isReEnrollFaceUnlock = getIntent().getBooleanExtra(
                     FaceSettings.KEY_RE_ENROLL_FACE, false);
             if (isReEnrollFaceUnlock) {
-                final Button removeBtn = ((LayoutPreference) mRemoveButton).findViewById(
-                        R.id.security_settings_face_settings_remove_button);
-                if (removeBtn != null && removeBtn.isEnabled()) {
-                    mRemoveController.onClick(removeBtn);
+                if (Flags.biometricsOnboardingEducation()) {
+                    if (mFaceRemoveButton.isEnabled()) {
+                        mRemoveController.onPreferenceClick(mFaceRemoveButton);
+                    }
+                } else {
+                    final Button removeBtn = ((LayoutPreference) mRemoveButton).findViewById(
+                            R.id.security_settings_face_settings_remove_button);
+                    if (removeBtn != null && removeBtn.isEnabled()) {
+                        mRemoveController.onClick(removeBtn);
+                    }
                 }
             }
         }
@@ -327,8 +365,7 @@
                 });
 
                 final boolean hasEnrolled = mFaceManager.hasEnrolledTemplates(mUserId);
-                mEnrollButton.setVisible(!hasEnrolled);
-                mRemoveButton.setVisible(hasEnrolled);
+                updateFaceAddAndRemovePreference(hasEnrolled);
                 final Utils.BiometricStatus biometricAuthStatus =
                         Utils.requestBiometricAuthenticationForMandatoryBiometrics(getActivity(),
                                 mBiometricsAuthenticationRequested,
@@ -407,6 +444,17 @@
         return mControllers;
     }
 
+    private void updateFaceAddAndRemovePreference(boolean hasEnrolled) {
+        if (Flags.biometricsOnboardingEducation()) {
+            mFaceEnrolledCategory.setVisible(true);
+            mFaceRemoveButton.setVisible(hasEnrolled);
+            mFaceEnrollButton.setVisible(!hasEnrolled);
+        } else {
+            mEnrollButton.setVisible(!hasEnrolled);
+            mRemoveButton.setVisible(hasEnrolled);
+        }
+    }
+
     private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
         final List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(new FaceSettingsKeyguardPreferenceController(context));
diff --git a/src/com/android/settings/biometrics/face/FaceSettingsAppsPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsAppsPreferenceController.java
index f859060..fc582d4 100644
--- a/src/com/android/settings/biometrics/face/FaceSettingsAppsPreferenceController.java
+++ b/src/com/android/settings/biometrics/face/FaceSettingsAppsPreferenceController.java
@@ -23,6 +23,7 @@
 import android.provider.Settings;
 
 import androidx.annotation.NonNull;
+import androidx.preference.Preference;
 
 import com.android.settings.Utils;
 import com.android.settings.biometrics.activeunlock.ActiveUnlockStatusUtils;
@@ -53,6 +54,20 @@
     }
 
     @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        if (!FaceSettings.isFaceHardwareDetected(mContext)) {
+            preference.setEnabled(false);
+        } else if (!mFaceManager.hasEnrolledTemplates(getUserId())) {
+            preference.setEnabled(false);
+        } else if (getRestrictingAdmin() != null) {
+            preference.setEnabled(false);
+        } else {
+            preference.setEnabled(true);
+        }
+    }
+
+    @Override
     public int getAvailabilityStatus() {
         final ActiveUnlockStatusUtils activeUnlockStatusUtils =
                 new ActiveUnlockStatusUtils(mContext);
diff --git a/src/com/android/settings/biometrics/face/FaceSettingsEnrollButtonPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsEnrollButtonPreferenceController.java
index 738f92f..a6f7a4f 100644
--- a/src/com/android/settings/biometrics/face/FaceSettingsEnrollButtonPreferenceController.java
+++ b/src/com/android/settings/biometrics/face/FaceSettingsEnrollButtonPreferenceController.java
@@ -24,10 +24,12 @@
 import android.view.View;
 import android.widget.Button;
 
+import androidx.annotation.NonNull;
 import androidx.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
+import com.android.settings.flags.Flags;
 import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.settingslib.RestrictedLockUtilsInternal;
 import com.android.settingslib.widget.LayoutPreference;
@@ -39,10 +41,11 @@
  * Preference controller that allows a user to enroll their face.
  */
 public class FaceSettingsEnrollButtonPreferenceController extends BasePreferenceController
-        implements View.OnClickListener {
+        implements View.OnClickListener, Preference.OnPreferenceClickListener {
 
     private static final String TAG = "FaceSettings/Remove";
     static final String KEY = "security_settings_face_enroll_faces_container";
+    static final String KEY_1 = "security_settings_face_enroll";
 
     private final Context mContext;
 
@@ -53,7 +56,7 @@
     private Listener mListener;
 
     public FaceSettingsEnrollButtonPreferenceController(Context context) {
-        this(context, KEY);
+        this(context, Flags.biometricsOnboardingEducation() ? KEY_1 : KEY);
     }
 
     public FaceSettingsEnrollButtonPreferenceController(Context context, String preferenceKey) {
@@ -62,25 +65,39 @@
     }
 
     @Override
-    public void updateState(Preference preference) {
+    public void updateState(@NonNull Preference preference) {
         super.updateState(preference);
-
-        mButton = ((LayoutPreference) preference).findViewById(
-                R.id.security_settings_face_settings_enroll_button);
-
-        if (PartnerStyleHelper.shouldApplyPartnerResource(mButton)) {
-            ButtonStyler.applyPartnerCustomizationPrimaryButtonStyle(mContext, mButton);
-        }
-
-        mButton.setOnClickListener(this);
         final boolean isDeviceOwnerBlockingAuth =
                 RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
                         mContext, DevicePolicyManager.KEYGUARD_DISABLE_FACE, mUserId) != null;
-        mButton.setEnabled(!isDeviceOwnerBlockingAuth);
+
+        if (Flags.biometricsOnboardingEducation()) {
+            preference.setEnabled(!isDeviceOwnerBlockingAuth);
+        } else {
+            mButton = ((LayoutPreference) preference).findViewById(
+                    R.id.security_settings_face_settings_enroll_button);
+
+            if (PartnerStyleHelper.shouldApplyPartnerResource(mButton)) {
+                ButtonStyler.applyPartnerCustomizationPrimaryButtonStyle(mContext, mButton);
+            }
+
+            mButton.setOnClickListener(this);
+            mButton.setEnabled(!isDeviceOwnerBlockingAuth);
+        }
     }
 
     @Override
     public void onClick(View v) {
+        startEnrolling();
+    }
+
+    @Override
+    public boolean onPreferenceClick(@NonNull Preference preference) {
+        startEnrolling();
+        return true;
+    }
+
+    private void startEnrolling() {
         mIsClicked = true;
         final Intent intent = new Intent();
         intent.setClassName(SETTINGS_PACKAGE_NAME, FaceEnroll.class.getName());
diff --git a/src/com/android/settings/biometrics/face/FaceSettingsFeatureProvider.kt b/src/com/android/settings/biometrics/face/FaceSettingsFeatureProvider.kt
new file mode 100644
index 0000000..c692398
--- /dev/null
+++ b/src/com/android/settings/biometrics/face/FaceSettingsFeatureProvider.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2025 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.biometrics.face
+
+/**
+ * Provide features for FaceSettings page.
+ */
+open class FaceSettingsFeatureProvider {
+    /**
+     * Get the description shown in the Face settings page.
+     */
+    open fun getSettingPageDescription(): Int {
+        return 0
+    }
+
+    /**
+     * Get the footer description for face class3 shown in the Face settings page.
+     */
+    open fun getSettingPageFooterDescriptionClass3(): Int {
+        return com.android.settings.R.string.security_settings_face_settings_footer_class3
+    }
+
+    /**
+     * Get the footer learn more description shown in the Face settings page.
+     */
+    open fun getSettingPageFooterLearnMoreDescription(): Int {
+        return 0
+    }
+
+    /**
+     * Get the footer learn more URL.
+     */
+    open fun getSettingPageFooterLearnMoreUrl(): Int {
+        return 0
+    }
+
+    companion object {
+        @JvmStatic
+        val instance = FaceSettingsFeatureProvider()
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceController.java
index d56c9b3..e64327c 100644
--- a/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceController.java
+++ b/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceController.java
@@ -19,11 +19,13 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.content.res.ResourceId;
 import android.hardware.biometrics.SensorProperties;
 import android.hardware.face.FaceManager;
 import android.hardware.face.FaceSensorPropertiesInternal;
 import android.hardware.face.IFaceAuthenticatorsRegisteredCallback;
 import android.util.Log;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.preference.Preference;
@@ -35,6 +37,7 @@
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.utils.AnnotationSpan;
 import com.android.settingslib.HelpUtils;
+import com.android.settingslib.widget.FooterPreference;
 
 import java.util.List;
 
@@ -82,14 +85,15 @@
                 mContext, mContext.getString(R.string.help_url_face), getClass().getName());
         final AnnotationSpan.LinkInfo linkInfo =
                 new AnnotationSpan.LinkInfo(mContext, ANNOTATION_URL, helpIntent);
-
-        int footerRes;
+        final FaceSettingsFeatureProvider featureProvider = FeatureFactory.getFeatureFactory()
+                .getFaceFeatureProvider().getFaceSettingsFeatureProvider();
+        final int footerRes;
         boolean isAttentionSupported = mProvider.isAttentionSupported(mContext);
         if (Utils.isPrivateProfile(mUserId, mContext)) {
             footerRes = R.string.private_space_face_settings_footer;
         } else if (mIsFaceStrong) {
             footerRes = isAttentionSupported
-                    ? R.string.security_settings_face_settings_footer_class3
+                    ? featureProvider.getSettingPageFooterDescriptionClass3()
                     : R.string.security_settings_face_settings_footer_attention_not_supported;
         } else {
             footerRes = isAttentionSupported
@@ -98,6 +102,20 @@
         }
         preference.setTitle(AnnotationSpan.linkify(
                 mContext.getText(footerRes), linkInfo));
+
+        final int learnMoreRes = featureProvider.getSettingPageFooterLearnMoreDescription();
+        final int learnMoreUrlRes = featureProvider.getSettingPageFooterLearnMoreUrl();
+        if (ResourceId.isValid(learnMoreRes)
+                && ResourceId.isValid(learnMoreUrlRes)
+                && preference instanceof FooterPreference) {
+            final Intent learnMoreIntent = HelpUtils.getHelpIntent(
+                    mContext, mContext.getString(learnMoreUrlRes), getClass().getName());
+            final View.OnClickListener learnMoreClickListener = (v) -> {
+                mContext.startActivityForResult(KEY, learnMoreIntent, 0, null);
+            };
+            ((FooterPreference) preference).setLearnMoreAction(learnMoreClickListener);
+            ((FooterPreference) preference).setLearnMoreText(mContext.getString(learnMoreRes));
+        }
     }
 
     public void setUserId(int userId) {
diff --git a/src/com/android/settings/biometrics/face/FaceSettingsKeyguardUnlockPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsKeyguardUnlockPreferenceController.java
index e6298c0..db9175c 100644
--- a/src/com/android/settings/biometrics/face/FaceSettingsKeyguardUnlockPreferenceController.java
+++ b/src/com/android/settings/biometrics/face/FaceSettingsKeyguardUnlockPreferenceController.java
@@ -19,9 +19,11 @@
 import static android.provider.Settings.Secure.FACE_KEYGUARD_ENABLED;
 
 import android.content.Context;
+import android.hardware.face.FaceManager;
 import android.provider.Settings;
 
 import androidx.annotation.NonNull;
+import androidx.preference.Preference;
 
 import com.android.settings.Utils;
 import com.android.settings.biometrics.activeunlock.ActiveUnlockStatusUtils;
@@ -32,9 +34,12 @@
     private static final int OFF = 0;
     private static final int DEFAULT = ON;
 
+    private FaceManager mFaceManager;
+
     public FaceSettingsKeyguardUnlockPreferenceController(
             @NonNull Context context, @NonNull String key) {
         super(context, key);
+        mFaceManager = Utils.getFaceManagerOrNull(context);
     }
 
     @Override
@@ -50,6 +55,20 @@
     }
 
     @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        if (!FaceSettings.isFaceHardwareDetected(mContext)) {
+            preference.setEnabled(false);
+        } else if (!mFaceManager.hasEnrolledTemplates(getUserId())) {
+            preference.setEnabled(false);
+        } else if (getRestrictingAdmin() != null) {
+            preference.setEnabled(false);
+        } else {
+            preference.setEnabled(true);
+        }
+    }
+
+    @Override
     public int getAvailabilityStatus() {
         final ActiveUnlockStatusUtils activeUnlockStatusUtils =
                 new ActiveUnlockStatusUtils(mContext);
diff --git a/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java
index ae5b62b..ea214fd 100644
--- a/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java
+++ b/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java
@@ -31,6 +31,7 @@
 import android.widget.Toast;
 import android.window.OnBackInvokedCallback;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
@@ -40,6 +41,7 @@
 import com.android.settings.biometrics.BiometricUtils;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.flags.Flags;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.widget.LayoutPreference;
@@ -54,10 +56,11 @@
  * will likely change if multiple enrollments are allowed/supported.
  */
 public class FaceSettingsRemoveButtonPreferenceController extends BasePreferenceController
-        implements View.OnClickListener {
+        implements View.OnClickListener, Preference.OnPreferenceClickListener {
 
     private static final String TAG = "FaceSettings/Remove";
     static final String KEY = "security_settings_face_delete_faces_container";
+    static final String KEY_1 = "security_settings_face_remove";
 
     public static class ConfirmRemoveDialog extends InstrumentedDialogFragment
             implements OnBackInvokedCallback {
@@ -173,7 +176,11 @@
             if (remaining == 0) {
                 final List<Face> faces = mFaceManager.getEnrolledFaces(mUserId);
                 if (!faces.isEmpty()) {
-                    mButton.setEnabled(true);
+                    if (Flags.biometricsOnboardingEducation()) {
+                        mPreference.setEnabled(true);
+                    } else {
+                        mButton.setEnabled(true);
+                    }
                 } else {
                     mRemoving = false;
                     mListener.onRemoved();
@@ -189,7 +196,11 @@
         @Override
         public void onClick(DialogInterface dialog, int which) {
             if (which == DialogInterface.BUTTON_POSITIVE) {
-                mButton.setEnabled(false);
+                if (Flags.biometricsOnboardingEducation()) {
+                    mPreference.setEnabled(false);
+                } else {
+                    mButton.setEnabled(false);
+                }
                 final List<Face> faces = mFaceManager.getEnrolledFaces(mUserId);
                 if (faces.isEmpty()) {
                     Log.e(TAG, "No faces");
@@ -202,7 +213,11 @@
                 // Remove the first/only face
                 mFaceUpdater.remove(faces.get(0), mUserId, mRemovalCallback);
             } else {
-                mButton.setEnabled(true);
+                if (Flags.biometricsOnboardingEducation()) {
+                    mPreference.setEnabled(true);
+                } else {
+                    mButton.setEnabled(true);
+                }
                 mRemoving = false;
             }
 
@@ -224,7 +239,7 @@
     }
 
     public FaceSettingsRemoveButtonPreferenceController(Context context) {
-        this(context, KEY);
+        this(context, Flags.biometricsOnboardingEducation() ? KEY_1 : KEY);
     }
 
     public void setUserId(int userId) {
@@ -232,19 +247,21 @@
     }
 
     @Override
-    public void updateState(Preference preference) {
+    public void updateState(@NonNull Preference preference) {
         super.updateState(preference);
 
         mPreference = preference;
-        mButton = ((LayoutPreference) preference)
-                .findViewById(R.id.security_settings_face_settings_remove_button);
+        if (!Flags.biometricsOnboardingEducation()) {
+            mButton = ((LayoutPreference) preference)
+                    .findViewById(R.id.security_settings_face_settings_remove_button);
 
-        if (PartnerStyleHelper.shouldApplyPartnerResource(mButton)) {
-            ButtonStyler.applyPartnerCustomizationPrimaryButtonStyle(mContext, mButton);
+            if (PartnerStyleHelper.shouldApplyPartnerResource(mButton)) {
+                ButtonStyler.applyPartnerCustomizationPrimaryButtonStyle(mContext, mButton);
+            }
+
+            mButton.setOnClickListener(this);
         }
 
-        mButton.setOnClickListener(this);
-
         // If there is already a ConfirmRemoveDialog showing, reset the listener since the
         // controller has been recreated.
         ConfirmRemoveDialog removeDialog =
@@ -256,10 +273,19 @@
             removeDialog.setOnClickListener(mOnConfirmDialogClickListener);
         }
 
-        if (!FaceSettings.isFaceHardwareDetected(mContext)) {
-            mButton.setEnabled(false);
+        final boolean isFaceHardwareDetected = FaceSettings.isFaceHardwareDetected(mContext);
+        if (Flags.biometricsOnboardingEducation()) {
+            if (!isFaceHardwareDetected) {
+                mPreference.setEnabled(false);
+            } else {
+                mPreference.setEnabled(!mRemoving);
+            }
         } else {
-            mButton.setEnabled(!mRemoving);
+            if (!isFaceHardwareDetected) {
+                mButton.setEnabled(false);
+            } else {
+                mButton.setEnabled(!mRemoving);
+            }
         }
     }
 
@@ -270,22 +296,32 @@
 
     @Override
     public String getPreferenceKey() {
-        return KEY;
+        return Flags.biometricsOnboardingEducation() ? KEY_1 : KEY;
     }
 
     @Override
     public void onClick(View v) {
         if (v == mButton) {
-            mMetricsFeatureProvider.logClickedPreference(mPreference, getMetricsCategory());
-            mRemoving = true;
-            ConfirmRemoveDialog confirmRemoveDialog =
-                    ConfirmRemoveDialog.newInstance(BiometricUtils.isConvenience(mFaceManager));
-            confirmRemoveDialog.setOnClickListener(mOnConfirmDialogClickListener);
-            confirmRemoveDialog.show(mActivity.getSupportFragmentManager(),
-                            ConfirmRemoveDialog.class.getName());
+            showRemoveDialog();
         }
     }
 
+    @Override
+    public boolean onPreferenceClick(@NonNull Preference preference) {
+        showRemoveDialog();
+        return true;
+    }
+
+    private void showRemoveDialog() {
+        mMetricsFeatureProvider.logClickedPreference(mPreference, getMetricsCategory());
+        mRemoving = true;
+        ConfirmRemoveDialog confirmRemoveDialog =
+                ConfirmRemoveDialog.newInstance(BiometricUtils.isConvenience(mFaceManager));
+        confirmRemoveDialog.setOnClickListener(mOnConfirmDialogClickListener);
+        confirmRemoveDialog.show(mActivity.getSupportFragmentManager(),
+                ConfirmRemoveDialog.class.getName());
+    }
+
     public void setListener(Listener listener) {
         mListener = listener;
     }
diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java b/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java
index 2548b95..c455312 100644
--- a/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java
+++ b/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java
@@ -44,7 +44,6 @@
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.flags.FeatureFlags;
 import com.android.settings.flags.FeatureFlagsImpl;
-import com.android.settings.flags.Flags;
 import com.android.settings.overlay.DockUpdaterFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.bluetooth.BluetoothDeviceFilter;
@@ -280,9 +279,6 @@
 
     @Override
     public void updateDynamicRawDataToIndex(List<SearchIndexableRaw> rawData) {
-        if (!Flags.enableBondedBluetoothDeviceSearchable()) {
-            return;
-        }
         if (mLocalBluetoothManager == null) {
             Log.d(TAG, "Bluetooth is not supported");
             return;
diff --git a/src/com/android/settings/connecteddevice/display/ExternalDisplayPreferenceFragment.java b/src/com/android/settings/connecteddevice/display/ExternalDisplayPreferenceFragment.java
index 3718fab..2b92e50 100644
--- a/src/com/android/settings/connecteddevice/display/ExternalDisplayPreferenceFragment.java
+++ b/src/com/android/settings/connecteddevice/display/ExternalDisplayPreferenceFragment.java
@@ -18,12 +18,13 @@
 
 import static android.view.Display.INVALID_DISPLAY;
 
-import static com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.EXTERNAL_DISPLAY_HELP_URL;
 import static com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.DISPLAY_ID_ARG;
+import static com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.EXTERNAL_DISPLAY_HELP_URL;
 import static com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.EXTERNAL_DISPLAY_NOT_FOUND_RESOURCE;
 import static com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.isDisplayAllowed;
 import static com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.isTopologyPaneEnabled;
 import static com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.isUseDisplaySettingEnabled;
+import static com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.isDisplaySizeSettingEnabled;
 import static com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.isResolutionSettingEnabled;
 import static com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.isRotationSettingEnabled;
 
@@ -45,6 +46,7 @@
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragmentBase;
+import com.android.settings.accessibility.AccessibilitySeekBarPreference;
 import com.android.settings.accessibility.TextReadingPreferenceFragment;
 import com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.DisplayListener;
 import com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.Injector;
@@ -68,6 +70,7 @@
     static final String EXTERNAL_DISPLAY_USE_PREFERENCE_KEY = "external_display_use_preference";
     static final String EXTERNAL_DISPLAY_ROTATION_KEY = "external_display_rotation";
     static final String EXTERNAL_DISPLAY_RESOLUTION_PREFERENCE_KEY = "external_display_resolution";
+    static final String EXTERNAL_DISPLAY_SIZE_PREFERENCE_KEY = "external_display_size";
     static final int EXTERNAL_DISPLAY_CHANGE_RESOLUTION_FOOTER_RESOURCE =
             R.string.external_display_change_resolution_footer_title;
     static final int EXTERNAL_DISPLAY_LANDSCAPE_DRAWABLE =
@@ -84,6 +87,8 @@
             R.string.external_display_rotation;
     static final int EXTERNAL_DISPLAY_RESOLUTION_TITLE_RESOURCE =
             R.string.external_display_resolution_settings_title;
+    static final int EXTERNAL_DISPLAY_SIZE_TITLE_RESOURCE = R.string.screen_zoom_title;
+    static final int EXTERNAL_DISPLAY_SIZE_SUMMARY_RESOURCE = R.string.screen_zoom_short_summary;
     static final int BUILTIN_DISPLAY_SETTINGS_CATEGORY_RESOURCE =
             R.string.builtin_display_settings_category;
     @VisibleForTesting
@@ -111,6 +116,7 @@
     private Preference mBuiltinDisplaySizeAndTextPreference;
     @Nullable
     private Injector mInjector;
+    @Nullable private AccessibilitySeekBarPreference mDisplaySizePreference;
     @Nullable
     private String[] mRotationEntries;
     @Nullable
@@ -345,6 +351,21 @@
         return mMirrorPreference;
     }
 
+    @NonNull
+    @VisibleForTesting
+    AccessibilitySeekBarPreference getSizePreference(@NonNull Context context) {
+        if (mDisplaySizePreference == null) {
+            mDisplaySizePreference = new AccessibilitySeekBarPreference(context, /* attrs= */ null);
+            mDisplaySizePreference.setIconStart(R.drawable.ic_remove_24dp);
+            mDisplaySizePreference.setIconStartContentDescription(
+                    R.string.screen_zoom_make_smaller_desc);
+            mDisplaySizePreference.setIconEnd(R.drawable.ic_add_24dp);
+            mDisplaySizePreference.setIconEndContentDescription(
+                    R.string.screen_zoom_make_larger_desc);
+        }
+        return mDisplaySizePreference;
+    }
+
     private void restoreState(@Nullable Bundle savedInstanceState) {
         if (savedInstanceState == null) {
             return;
@@ -428,6 +449,9 @@
             screen.addPreference(updateFooterPreference(context,
                     EXTERNAL_DISPLAY_CHANGE_RESOLUTION_FOOTER_RESOURCE));
         }
+        if (isDisplaySizeSettingEnabled(mInjector)) {
+            screen.addPreference(updateSizePreference(context));
+        }
     }
 
     private void showDisplaysList(@NonNull List<Display> displaysToShow,
@@ -599,6 +623,20 @@
         return pref;
     }
 
+    private Preference updateSizePreference(@NonNull final Context context) {
+        var pref = (Preference) getSizePreference(context);
+        pref.setKey(EXTERNAL_DISPLAY_SIZE_PREFERENCE_KEY);
+        pref.setSummary(EXTERNAL_DISPLAY_SIZE_SUMMARY_RESOURCE);
+        pref.setPersistent(false);
+        pref.setTitle(EXTERNAL_DISPLAY_SIZE_TITLE_RESOURCE);
+        pref.setOnPreferenceClickListener(
+                (Preference p) -> {
+                    writePreferenceClickMetric(p);
+                    return true;
+                });
+        return pref;
+    }
+
     private int getDisplayRotation(int displayId) {
         if (mInjector == null) {
             return 0;
diff --git a/src/com/android/settings/connecteddevice/display/ExternalDisplaySettingsConfiguration.java b/src/com/android/settings/connecteddevice/display/ExternalDisplaySettingsConfiguration.java
index 2a1fc12..666bf37 100644
--- a/src/com/android/settings/connecteddevice/display/ExternalDisplaySettingsConfiguration.java
+++ b/src/com/android/settings/connecteddevice/display/ExternalDisplaySettingsConfiguration.java
@@ -353,4 +353,8 @@
     static boolean isRotationSettingEnabled(@Nullable Injector injector) {
         return injector != null && injector.getFlags().rotationConnectedDisplaySetting();
     }
+
+    static boolean isDisplaySizeSettingEnabled(@Nullable Injector injector) {
+        return injector != null && injector.getFlags().displaySizeConnectedDisplaySetting();
+    }
 }
diff --git a/src/com/android/settings/contract/SettingsContract.kt b/src/com/android/settings/contract/SettingsContract.kt
index 4316e3c..d3798da 100644
--- a/src/com/android/settings/contract/SettingsContract.kt
+++ b/src/com/android/settings/contract/SettingsContract.kt
@@ -33,5 +33,17 @@
 /** Contract key for the "Wi-fi" setting. */
 const val KEY_WIFI = SettingsSlicesContract.KEY_WIFI
 
+/** Contract key for the "Use Wi-Fi calling" setting. */
+const val KEY_WIFI_CALLING = "wifi_calling"
+
 /** Contract key for the "Use Data Saver" setting. */
 const val KEY_DATA_SAVER = "data_saver"
+
+/** Contract key for the "Mobile data" setting. */
+const val KEY_MOBILE_DATA = "mobile_data"
+
+/** Contract key for the "Adaptive brightness" setting. */
+const val KEY_ADAPTIVE_BRIGHTNESS = "auto_brightness"
+
+/** Contract key for the "Screen attention" setting. */
+const val KEY_SCREEN_ATTENTION = "screen_attention"
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
index 0c8f408..6e2d4b0 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
@@ -37,6 +37,7 @@
 
 import com.android.settings.R;
 import com.android.settings.vpn2.VpnUtils;
+import com.android.settingslib.supervision.SupervisionIntentProvider;
 import com.android.settingslib.utils.WorkPolicyUtils;
 
 import java.util.Date;
@@ -44,6 +45,7 @@
 
 public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFeatureProvider {
 
+    @Deprecated
     public static final String ACTION_PARENTAL_CONTROLS =
             "android.settings.SHOW_PARENTAL_CONTROLS";
 
@@ -243,7 +245,10 @@
 
     @Override
     public boolean showParentalControls() {
-        Intent intent = getParentalControlsIntent();
+        Intent intent =
+                android.app.supervision.flags.Flags.deprecateDpmSupervisionApis()
+                        ? SupervisionIntentProvider.getSettingsIntent(mContext)
+                        : getParentalControlsIntent();
         if (intent != null) {
             mContext.startActivity(intent);
             return true;
@@ -261,6 +266,7 @@
                         == UserProperties.SHOW_IN_QUIET_MODE_HIDDEN;
     }
 
+    @Deprecated
     private Intent getParentalControlsIntent() {
         final ComponentName componentName =
                 mDpm.getProfileOwnerOrDeviceOwnerSupervisionComponent(new UserHandle(MY_USER_ID));
diff --git a/src/com/android/settings/inputmethod/MouseKeysImageListAdapter.java b/src/com/android/settings/inputmethod/MouseKeysImageListAdapter.java
index 9aab3a4..d3a97b6 100644
--- a/src/com/android/settings/inputmethod/MouseKeysImageListAdapter.java
+++ b/src/com/android/settings/inputmethod/MouseKeysImageListAdapter.java
@@ -22,6 +22,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -124,18 +125,19 @@
 
     public static class MouseKeyImageViewHolder extends RecyclerView.ViewHolder {
         private final TextView mTextView;
+        private final ImageView mImageView;
         private final Context mContext;
 
         public MouseKeyImageViewHolder(View itemView, Context context) {
             super(itemView);
-            mTextView = (TextView) itemView;
+            mTextView = itemView.findViewById(R.id.layout_description);
+            mImageView = itemView.findViewById(R.id.image);
             mContext = context;
         }
 
         void bindView(int drawableRes, String summary) {
             mTextView.setText(summary);
-            mTextView.setCompoundDrawablesWithIntrinsicBounds(null,
-                    mContext.getDrawable(drawableRes), null, null);
+            mImageView.setImageDrawable(mContext.getDrawable(drawableRes));
         }
     }
 }
diff --git a/src/com/android/settings/inputmethod/MouseKeysMainPageFragment.java b/src/com/android/settings/inputmethod/MouseKeysMainPageFragment.java
index 1f6035f..12604bd 100644
--- a/src/com/android/settings/inputmethod/MouseKeysMainPageFragment.java
+++ b/src/com/android/settings/inputmethod/MouseKeysMainPageFragment.java
@@ -20,6 +20,7 @@
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
+import android.content.res.Configuration;
 import android.hardware.input.InputManager;
 import android.os.Bundle;
 import android.view.InputDevice;
@@ -32,6 +33,7 @@
 
 import com.android.internal.util.Preconditions;
 import com.android.settings.R;
+import com.android.settings.activityembedding.ActivityEmbeddingUtils;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.keyboard.Flags;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -125,7 +127,11 @@
     private void configureImagesPreference() {
         final RecyclerView recyclerView = mMouseKeyImagesPreference.findViewById(
                 R.id.mouse_keys_image_recycler_list);
-        recyclerView.setLayoutManager(new GridLayoutManager(getActivity(), 2));
+        boolean isPortrait = getResources().getConfiguration().orientation
+                == Configuration.ORIENTATION_PORTRAIT;
+        boolean isTwoPaneState = ActivityEmbeddingUtils.isAlreadyEmbedded(this.getActivity());
+        int column = isPortrait && !isTwoPaneState ? 1 : 2;
+        recyclerView.setLayoutManager(new GridLayoutManager(getActivity(), column));
         recyclerView.setAdapter(new MouseKeysImageListAdapter(getActivity(), mCurrentInputDevice));
     }
 
diff --git a/src/com/android/settings/network/MobileDataPreference.kt b/src/com/android/settings/network/MobileDataPreference.kt
index 2f2dbe2..80f58e0 100644
--- a/src/com/android/settings/network/MobileDataPreference.kt
+++ b/src/com/android/settings/network/MobileDataPreference.kt
@@ -58,8 +58,6 @@
 
     override fun getWritePermissions(context: Context) =
         Permissions.allOf(
-            // SubscriptionManager.createForAllUserProfiles
-            Manifest.permission.INTERACT_ACROSS_PROFILES,
             // TelephonyManager.setDataEnabledForReason
             Manifest.permission.MODIFY_PHONE_STATE,
         )
diff --git a/src/com/android/settings/network/MobileNetworkRepository.java b/src/com/android/settings/network/MobileNetworkRepository.java
index 317abe0..284d23d 100644
--- a/src/com/android/settings/network/MobileNetworkRepository.java
+++ b/src/com/android/settings/network/MobileNetworkRepository.java
@@ -37,7 +37,6 @@
 import androidx.annotation.NonNull;
 import androidx.lifecycle.LifecycleOwner;
 
-import com.android.internal.telephony.flags.Flags;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.mobile.dataservice.MobileNetworkDatabase;
@@ -509,8 +508,7 @@
                     }
                     if (subInfo.isEmbedded()
                         && (subInfo.getProfileClass() == PROFILE_CLASS_PROVISIONING
-                            || (Flags.oemEnabledSatelliteFlag()
-                            && subInfo.isOnlyNonTerrestrialNetwork()))) {
+                            || subInfo.isOnlyNonTerrestrialNetwork())) {
                         if (DEBUG) {
                             Log.d(TAG, "Do not insert the provisioning or satellite eSIM");
                         }
diff --git a/src/com/android/settings/network/SubscriptionUtil.java b/src/com/android/settings/network/SubscriptionUtil.java
index aca2fc3..af1ed4c 100644
--- a/src/com/android/settings/network/SubscriptionUtil.java
+++ b/src/com/android/settings/network/SubscriptionUtil.java
@@ -824,8 +824,7 @@
     private static boolean isEmbeddedSubscriptionVisible(@NonNull SubscriptionInfo subInfo) {
         if (subInfo.isEmbedded()
                 && (subInfo.getProfileClass() == PROFILE_CLASS_PROVISIONING
-                || (com.android.internal.telephony.flags.Flags.oemEnabledSatelliteFlag()
-                && subInfo.isOnlyNonTerrestrialNetwork()))) {
+                    || subInfo.isOnlyNonTerrestrialNetwork())) {
             return false;
         }
         return true;
diff --git a/src/com/android/settings/sim/CallsSimListDialogFragment.java b/src/com/android/settings/sim/CallsSimListDialogFragment.java
index bb82c2e..ffaa524 100644
--- a/src/com/android/settings/sim/CallsSimListDialogFragment.java
+++ b/src/com/android/settings/sim/CallsSimListDialogFragment.java
@@ -26,8 +26,6 @@
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 
-import com.android.internal.telephony.flags.Flags;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -59,8 +57,7 @@
             SubscriptionInfo info = subscriptionManager.getActiveSubscriptionInfo(subId);
             if (info == null || (info.isEmbedded()
                 && (info.getProfileClass() == PROFILE_CLASS_PROVISIONING
-                    || (Flags.oemEnabledSatelliteFlag()
-                        && info.isOnlyNonTerrestrialNetwork())))) {
+                    || info.isOnlyNonTerrestrialNetwork()))) {
                 continue;
             }
             result.add(subscriptionManager.getActiveSubscriptionInfo(subId));
diff --git a/src/com/android/settings/sim/PreferredSimDialogFragment.java b/src/com/android/settings/sim/PreferredSimDialogFragment.java
index aa42f3c..6c9b708 100644
--- a/src/com/android/settings/sim/PreferredSimDialogFragment.java
+++ b/src/com/android/settings/sim/PreferredSimDialogFragment.java
@@ -34,7 +34,6 @@
 import androidx.annotation.VisibleForTesting;
 import androidx.appcompat.app.AlertDialog;
 
-import com.android.internal.telephony.flags.Flags;
 import com.android.settings.R;
 import com.android.settings.network.SubscriptionUtil;
 
@@ -105,7 +104,7 @@
         final SubscriptionInfo info = getPreferredSubscription();
         if (info == null || (info.isEmbedded()
             && (info.getProfileClass() == PROFILE_CLASS_PROVISIONING
-                || (Flags.oemEnabledSatelliteFlag() && info.isOnlyNonTerrestrialNetwork())))) {
+                || info.isOnlyNonTerrestrialNetwork()))) {
             dismiss("SubscriptionInfo is null or other esim's cases.");
             return;
         }
diff --git a/src/com/android/settings/sim/SelectSpecificDataSimDialogFragment.java b/src/com/android/settings/sim/SelectSpecificDataSimDialogFragment.java
index 6f3c824..21c6e91 100644
--- a/src/com/android/settings/sim/SelectSpecificDataSimDialogFragment.java
+++ b/src/com/android/settings/sim/SelectSpecificDataSimDialogFragment.java
@@ -35,7 +35,6 @@
 import androidx.annotation.VisibleForTesting;
 import androidx.appcompat.app.AlertDialog;
 
-import com.android.internal.telephony.flags.Flags;
 import com.android.settings.R;
 import com.android.settings.network.SubscriptionUtil;
 
@@ -137,12 +136,10 @@
 
         if ((newSubInfo.isEmbedded()
             && (newSubInfo.getProfileClass() == PROFILE_CLASS_PROVISIONING
-                || (Flags.oemEnabledSatelliteFlag()
-                    && newSubInfo.isOnlyNonTerrestrialNetwork())))
+                || newSubInfo.isOnlyNonTerrestrialNetwork()))
             || (currentDataSubInfo.isEmbedded()
             && (currentDataSubInfo.getProfileClass() == PROFILE_CLASS_PROVISIONING
-                || (Flags.oemEnabledSatelliteFlag()
-                    && currentDataSubInfo.isOnlyNonTerrestrialNetwork())))) {
+                || currentDataSubInfo.isOnlyNonTerrestrialNetwork()))) {
             Log.d(TAG, "do not set the provisioning or satellite eSIM");
             dismiss();
             return;
diff --git a/src/com/android/settings/sim/SimListDialogFragment.java b/src/com/android/settings/sim/SimListDialogFragment.java
index fd44dc7..e0bf128 100644
--- a/src/com/android/settings/sim/SimListDialogFragment.java
+++ b/src/com/android/settings/sim/SimListDialogFragment.java
@@ -39,7 +39,6 @@
 import androidx.annotation.VisibleForTesting;
 import androidx.appcompat.app.AlertDialog;
 
-import com.android.internal.telephony.flags.Flags;
 import com.android.settings.R;
 import com.android.settings.network.SubscriptionUtil;
 
@@ -145,7 +144,7 @@
         // Remove the provisioning or satellite eSIM from the subscription list.
         currentSubscriptions.removeIf(info -> info.isEmbedded()
             && (info.getProfileClass() == PROFILE_CLASS_PROVISIONING
-                || (Flags.oemEnabledSatelliteFlag() && info.isOnlyNonTerrestrialNetwork())));
+                || info.isOnlyNonTerrestrialNetwork()));
 
         boolean includeAskEveryTime = getArguments().getBoolean(KEY_INCLUDE_ASK_EVERY_TIME);
         boolean isCancelItemShowed = getArguments().getBoolean(KEY_SHOW_CANCEL_ITEM);
diff --git a/src/com/android/settings/slices/CustomSliceRegistry.java b/src/com/android/settings/slices/CustomSliceRegistry.java
index 4e8d312..41f1892 100644
--- a/src/com/android/settings/slices/CustomSliceRegistry.java
+++ b/src/com/android/settings/slices/CustomSliceRegistry.java
@@ -141,7 +141,7 @@
             .scheme(ContentResolver.SCHEME_CONTENT)
             .authority(SettingsSliceProvider.SLICE_AUTHORITY)
             .appendEncodedPath(SettingsSlicesContract.PATH_SETTING_ACTION)
-            .appendPath("mobile_data")
+            .appendPath(SettingsContractKt.KEY_MOBILE_DATA)
             .build();
 
     /**
@@ -220,7 +220,7 @@
             .scheme(ContentResolver.SCHEME_CONTENT)
             .authority(SettingsSliceProvider.SLICE_AUTHORITY)
             .appendPath(SettingsSlicesContract.PATH_SETTING_INTENT)
-            .appendPath(WifiCallingSliceHelper.PATH_WIFI_CALLING)
+            .appendPath(SettingsContractKt.KEY_WIFI_CALLING)
             .build();
     /**
      * Full {@link Uri} for the Wifi Calling Preference Slice.
diff --git a/src/com/android/settings/supervision/SupervisionPinManagementScreen.kt b/src/com/android/settings/supervision/SupervisionPinManagementScreen.kt
index d7cdaae..6d9874a6 100644
--- a/src/com/android/settings/supervision/SupervisionPinManagementScreen.kt
+++ b/src/com/android/settings/supervision/SupervisionPinManagementScreen.kt
@@ -42,6 +42,7 @@
 
     override fun getPreferenceHierarchy(context: Context) =
         preferenceHierarchy(context, this) {
+            +SupervisionPinRecoveryPreference()
             // TODO(b/391992481) implement the screen.
             +SupervisionChangePinPreference()
         }
diff --git a/src/com/android/settings/supervision/SupervisionPinRecoveryPreference.kt b/src/com/android/settings/supervision/SupervisionPinRecoveryPreference.kt
new file mode 100644
index 0000000..5a0e4ba
--- /dev/null
+++ b/src/com/android/settings/supervision/SupervisionPinRecoveryPreference.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2025 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.supervision
+
+import android.app.supervision.flags.Flags
+import android.content.Context
+import com.android.settings.R
+import androidx.preference.Preference
+import com.android.settingslib.metadata.PreferenceAvailabilityProvider
+import com.android.settingslib.metadata.PreferenceMetadata
+
+class SupervisionPinRecoveryPreference : PreferenceMetadata,
+    PreferenceAvailabilityProvider, Preference.OnPreferenceClickListener {
+    override val key: String
+        get() = SupervisionPinRecoveryPreference.KEY
+
+    override val title: Int
+        get() = R.string.supervision_add_forgot_pin_preference_title
+
+    override fun isAvailable(context: Context) = Flags.enableSupervisionPinRecoveryScreen()
+
+    // TODO(b/393657542): trigger re-authentication flow to confirm user credential before PIN
+    // recovery.
+    override fun onPreferenceClick(preference: Preference): Boolean {
+        return true
+    }
+
+    companion object {
+        const val KEY = "supervision_pin_recovery"
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java b/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java
index 4272ab7..d95ff83 100644
--- a/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java
+++ b/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java
@@ -64,11 +64,6 @@
     private static final String TAG = "WifiCallingSliceHelper";
 
     /**
-     * Settings slice path to wifi calling setting.
-     */
-    public static final String PATH_WIFI_CALLING = "wifi_calling";
-
-    /**
      * Settings slice path to wifi calling preference setting.
      */
     public static final String PATH_WIFI_CALLING_PREFERENCE =
diff --git a/tests/robotests/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceControllerTest.java
index 9de2fc2..12fd750 100644
--- a/tests/robotests/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceControllerTest.java
@@ -32,6 +32,8 @@
 import android.hardware.face.IFaceAuthenticatorsRegisteredCallback;
 import android.os.Looper;
 import android.os.RemoteException;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
 
 import androidx.preference.Preference;
 import androidx.preference.PreferenceManager;
@@ -60,6 +62,8 @@
 public class FaceSettingsFooterPreferenceControllerTest {
     @Rule
     public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
     private static final String PREF_KEY = "security_face_footer";
     @Mock
     private FaceManager mFaceManager;
@@ -140,6 +144,7 @@
     }
 
     @Test
+    @DisableFlags(com.android.settings.flags.Flags.FLAG_BIOMETRICS_ONBOARDING_EDUCATION)
     public void testString_faceClass3() throws RemoteException {
         setupHasFaceFeature();
         displayFaceSettingsFooterPreferenceController();
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
index 6fb2d11..d754993 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
@@ -344,7 +344,6 @@
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_ENABLE_BONDED_BLUETOOTH_DEVICE_SEARCHABLE)
     public void updateDynamicRawDataToIndex_deviceNotBonded_deviceIsNotSearchable() {
         when(mDevice.getBondState()).thenReturn(BluetoothDevice.BOND_NONE);
         List<SearchIndexableRaw> searchData = new ArrayList<>();
@@ -355,7 +354,6 @@
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_ENABLE_BONDED_BLUETOOTH_DEVICE_SEARCHABLE)
     public void updateDynamicRawDataToIndex_deviceBonded_deviceIsSearchable() {
         when(mDevice.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED);
         List<SearchIndexableRaw> searchData = new ArrayList<>();
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
index 87a447d..6fce10c 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
@@ -26,9 +26,11 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
 import android.app.admin.DevicePolicyManager;
+import android.app.supervision.SupervisionManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -42,6 +44,9 @@
 import android.net.VpnManager;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.Settings;
 import android.text.SpannableStringBuilder;
 
@@ -51,8 +56,10 @@
 
 import org.junit.Before;
 import org.junit.Ignore;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
 import org.mockito.ArgumentMatcher;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
@@ -68,10 +75,13 @@
 @RunWith(RobolectricTestRunner.class)
 public class EnterprisePrivacyFeatureProviderImplTest {
 
+    @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
     private static final String OWNER_ORGANIZATION = "ACME";
     private static final String VPN_PACKAGE_ID = "com.example.vpn";
     private static final String IME_PACKAGE_ID = "com.example.ime";
     private static final String IME_PACKAGE_LABEL = "Test IME";
+    private static final String SUPERVISION_PACKAGE = "com.supervision.app";
 
     private final ComponentName mOwner = new ComponentName("mock", "component");
     private final ComponentName mAdmin1 = new ComponentName("mock", "admin1");
@@ -82,19 +92,14 @@
 
     private List<UserInfo> mProfiles = new ArrayList<>();
 
-    @Mock
-    private Context mContext;
-    @Mock
-    private DevicePolicyManager mDevicePolicyManager;
-    @Mock
-    private PackageManager mPackageManager;
-    @Mock
-    private UserManager mUserManager;
-    @Mock
-    private ConnectivityManager mConnectivityManger;
-    @Mock
-    private VpnManager mVpnManager;
+    @Mock private Context mContext;
+    @Mock private DevicePolicyManager mDevicePolicyManager;
+    @Mock private PackageManager mPackageManager;
+    @Mock private UserManager mUserManager;
+    @Mock private ConnectivityManager mConnectivityManager;
+    @Mock private VpnManager mVpnManager;
     private Resources mResources;
+    @Mock private SupervisionManager mSupervisionManager;
 
     private EnterprisePrivacyFeatureProvider mProvider;
 
@@ -108,12 +113,14 @@
         when(mContext.getSystemService(Context.DEVICE_POLICY_SERVICE))
                 .thenReturn(mDevicePolicyManager);
         when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+        when(mContext.getSystemService(SupervisionManager.class))
+                .thenReturn(mSupervisionManager);
         when(mContext.getPackageManager()).thenReturn(mPackageManager);
         mProfiles.add(new UserInfo(mUserId, "", "", 0 /* flags */));
         mResources = RuntimeEnvironment.application.getResources();
 
         mProvider = new EnterprisePrivacyFeatureProviderImpl(mContext, mDevicePolicyManager,
-                mPackageManager, mUserManager, mConnectivityManger, mVpnManager, mResources);
+                mPackageManager, mUserManager, mConnectivityManager, mVpnManager, mResources);
     }
 
     @Test
@@ -430,6 +437,7 @@
     }
 
     @Test
+    @DisableFlags(android.app.supervision.flags.Flags.FLAG_DEPRECATE_DPM_SUPERVISION_APIS)
     public void testShowParentalControls() {
         when(mDevicePolicyManager.getProfileOwnerOrDeviceOwnerSupervisionComponent(any()))
                 .thenReturn(mOwner);
@@ -440,6 +448,25 @@
         verify(mContext).startActivity(intentEquals(intent));
     }
 
+    @Test
+    @EnableFlags(android.app.supervision.flags.Flags.FLAG_DEPRECATE_DPM_SUPERVISION_APIS)
+    public void testShowParentalControls_usingSupervisionManager() {
+        when(mSupervisionManager.getActiveSupervisionAppPackage())
+                .thenReturn(SUPERVISION_PACKAGE);
+        when(mPackageManager.queryIntentActivitiesAsUser(any(Intent.class), anyInt(), anyInt()))
+                .thenReturn(ImmutableList.of(new ResolveInfo()));
+
+        // If the intent is resolved, then we can use it to launch the activity.
+        assertThat(mProvider.showParentalControls()).isTrue();
+        verifyNoMoreInteractions(mDevicePolicyManager);
+
+        ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
+        verify(mContext).startActivity(captor.capture());
+        Intent intent = captor.getValue();
+        assertThat(intent).isNotNull();
+        assertThat(intent.getPackage()).isEqualTo(SUPERVISION_PACKAGE);
+    }
+
     private Intent addWorkPolicyInfoIntent(
             String packageName, boolean deviceOwner, boolean profileOwner) {
         Intent intent = new Intent(Settings.ACTION_SHOW_WORK_POLICY_INFO);
diff --git a/tests/robotests/src/com/android/settings/supervision/SupervisionPinRecoveryPreferenceTest.kt b/tests/robotests/src/com/android/settings/supervision/SupervisionPinRecoveryPreferenceTest.kt
new file mode 100644
index 0000000..3fa938f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/supervision/SupervisionPinRecoveryPreferenceTest.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2025 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.supervision
+
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class SupervisionPinRecoveryPreferenceTest {
+    private val context: Context = ApplicationProvider.getApplicationContext()
+
+    private val supervisionPinRecoveryPreference = SupervisionPinRecoveryPreference()
+
+    @Test
+    fun getTitle() {
+        assertThat(supervisionPinRecoveryPreference.getPreferenceTitle(context))
+            .isEqualTo("Forgot PIN")
+    }
+}
\ No newline at end of file
diff --git a/tests/spa_unit/src/com/android/settings/network/SubscriptionInfoListViewModelTest.kt b/tests/spa_unit/src/com/android/settings/network/SubscriptionInfoListViewModelTest.kt
index 6eb7c58..0a1dabc 100644
--- a/tests/spa_unit/src/com/android/settings/network/SubscriptionInfoListViewModelTest.kt
+++ b/tests/spa_unit/src/com/android/settings/network/SubscriptionInfoListViewModelTest.kt
@@ -89,24 +89,8 @@
     }
 
     @Test
-    fun onSubscriptionsChanged_flagOffHasNonTerrestrialNetwork_filterNonTerrestrialNetwork() =
-        runBlocking {
-            mSetFlagsRule.disableFlags(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)
-            activeSubscriptionInfoList = listOf(SUB_INFO_1, SUB_INFO_2, SUB_INFO_4)
-
-            val listDeferred = async {
-                createViewModel().subscriptionInfoListFlow.toListWithTimeout()
-            }
-            delay(100)
-            subInfoListener?.onSubscriptionsChanged()
-
-            assertThat(listDeferred.await()).contains(listOf(SUB_INFO_1, SUB_INFO_2, SUB_INFO_4))
-        }
-
-    @Test
     fun onSubscriptionsChanged_flagOnHasNonTerrestrialNetwork_filterNonTerrestrialNetwork() =
         runBlocking {
-            mSetFlagsRule.enableFlags(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)
             activeSubscriptionInfoList = listOf(SUB_INFO_1, SUB_INFO_2, SUB_INFO_4)
 
             val listDeferred = async {
diff --git a/tests/unit/src/com/android/settings/biometrics/combination/CombinedBiometricStatusUtilsTest.java b/tests/unit/src/com/android/settings/biometrics/combination/CombinedBiometricStatusUtilsTest.java
index 3a330f2..f2cf6b9 100644
--- a/tests/unit/src/com/android/settings/biometrics/combination/CombinedBiometricStatusUtilsTest.java
+++ b/tests/unit/src/com/android/settings/biometrics/combination/CombinedBiometricStatusUtilsTest.java
@@ -26,6 +26,7 @@
 import static org.mockito.Mockito.when;
 
 import android.app.admin.DevicePolicyManager;
+import android.app.supervision.SupervisionManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.PackageManager;
@@ -34,6 +35,8 @@
 import android.hardware.fingerprint.FingerprintManager;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
 import android.platform.test.flag.junit.SetFlagsRule;
 
 import androidx.test.core.app.ApplicationProvider;
@@ -70,6 +73,8 @@
     private FingerprintManager mFingerprintManager;
     @Mock
     private FaceManager mFaceManager;
+    @Mock
+    private SupervisionManager mSupervisionManager;
 
     private Context mApplicationContext;
     private CombinedBiometricStatusUtils mCombinedBiometricStatusUtils;
@@ -83,13 +88,13 @@
         when(mApplicationContext.getPackageManager()).thenReturn(mPackageManager);
         when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)).thenReturn(true);
         when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FACE)).thenReturn(true);
-        when(mDevicePolicyManager.getProfileOwnerOrDeviceOwnerSupervisionComponent(USER_HANDLE))
-                .thenReturn(COMPONENT_NAME);
         when(mApplicationContext.getSystemService(Context.FINGERPRINT_SERVICE))
                 .thenReturn(mFingerprintManager);
         when(mApplicationContext.getSystemService(Context.DEVICE_POLICY_SERVICE))
                 .thenReturn(mDevicePolicyManager);
         when(mApplicationContext.getSystemService(Context.FACE_SERVICE)).thenReturn(mFaceManager);
+        when(mApplicationContext.getSystemService(Context.SUPERVISION_SERVICE))
+                .thenReturn(mSupervisionManager);
         mCombinedBiometricStatusUtils = new CombinedBiometricStatusUtils(
                 mApplicationContext, USER_ID);
     }
@@ -175,7 +180,10 @@
     }
 
     @Test
+    @DisableFlags(android.app.supervision.flags.Flags.FLAG_DEPRECATE_DPM_SUPERVISION_APIS)
     public void getDisabledAdmin_whenFingerprintDisabled_whenFaceDisabled_returnsEnforcedAdmin() {
+        when(mDevicePolicyManager.getProfileOwnerOrDeviceOwnerSupervisionComponent(USER_HANDLE))
+                .thenReturn(COMPONENT_NAME);
         when(mDevicePolicyManager.getKeyguardDisabledFeatures(COMPONENT_NAME))
                 .thenReturn(KEYGUARD_DISABLE_FACE | KEYGUARD_DISABLE_FINGERPRINT);
 
@@ -187,6 +195,20 @@
     }
 
     @Test
+    @EnableFlags(android.app.supervision.flags.Flags.FLAG_DEPRECATE_DPM_SUPERVISION_APIS)
+    public void getDisabledAdmin_whenFingerprintDisabled_whenFaceDisabled_returnsRestrictions() {
+        when(mSupervisionManager.isSupervisionEnabledForUser(USER_ID)).thenReturn(true);
+        when(mDevicePolicyManager.getKeyguardDisabledFeatures(null))
+                .thenReturn(KEYGUARD_DISABLE_FACE | KEYGUARD_DISABLE_FINGERPRINT);
+
+        final RestrictedLockUtils.EnforcedAdmin admin =
+                mCombinedBiometricStatusUtils.getDisablingAdmin();
+
+        assertThat(admin.enforcedRestriction).isEqualTo(UserManager.DISALLOW_BIOMETRIC);
+        assertThat(admin.user).isEqualTo(USER_HANDLE);
+    }
+
+    @Test
     public void getDisabledAdmin_whenFingerprintDisabled_whenFaceEnabled_returnsNull() {
         when(mDevicePolicyManager.getKeyguardDisabledFeatures(COMPONENT_NAME))
                 .thenReturn(KEYGUARD_DISABLE_FINGERPRINT);
diff --git a/tests/unit/src/com/android/settings/biometrics/face/FaceSettingsEnrollButtonPreferenceControllerTest.java b/tests/unit/src/com/android/settings/biometrics/face/FaceSettingsEnrollButtonPreferenceControllerTest.java
index 4d21364..bf81390 100644
--- a/tests/unit/src/com/android/settings/biometrics/face/FaceSettingsEnrollButtonPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/biometrics/face/FaceSettingsEnrollButtonPreferenceControllerTest.java
@@ -24,6 +24,7 @@
 import android.content.Context;
 import android.widget.Button;
 
+import androidx.preference.Preference;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Before;
@@ -43,6 +44,8 @@
     @Mock
     private Button mButton;
     @Mock
+    private Preference mPreference;
+    @Mock
     private FaceSettingsEnrollButtonPreferenceController.Listener mListener;
 
     private FaceSettingsEnrollButtonPreferenceController mController;
@@ -65,4 +68,12 @@
         assertThat(mController.isClicked()).isTrue();
         verify(mListener).onStartEnrolling(any());
     }
+
+    @Test
+    public void testOnPreferenceClick() {
+        mController.onPreferenceClick(mPreference);
+
+        assertThat(mController.isClicked()).isTrue();
+        verify(mListener).onStartEnrolling(any());
+    }
 }
diff --git a/tests/unit/src/com/android/settings/biometrics/face/FaceStatusUtilsTest.java b/tests/unit/src/com/android/settings/biometrics/face/FaceStatusUtilsTest.java
index 6dfb1e6..f5d090a 100644
--- a/tests/unit/src/com/android/settings/biometrics/face/FaceStatusUtilsTest.java
+++ b/tests/unit/src/com/android/settings/biometrics/face/FaceStatusUtilsTest.java
@@ -23,6 +23,7 @@
 import static org.mockito.Mockito.when;
 
 import android.app.admin.DevicePolicyManager;
+import android.app.supervision.SupervisionManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.PackageManager;
@@ -30,6 +31,9 @@
 import android.hardware.fingerprint.FingerprintManager;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
 
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -39,6 +43,7 @@
 import com.android.settingslib.RestrictedLockUtils;
 
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -47,12 +52,14 @@
 @RunWith(AndroidJUnit4.class)
 public class FaceStatusUtilsTest {
 
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
     private static final ComponentName COMPONENT_NAME =
             new ComponentName("package", "class");
     private static final int USER_ID = UserHandle.myUserId();
     private static final UserHandle USER_HANDLE = new UserHandle(USER_ID);
 
-
     @Mock
     private PackageManager mPackageManager;
     @Mock
@@ -61,6 +68,8 @@
     private FingerprintManager mFingerprintManager;
     @Mock
     private FaceManager mFaceManager;
+    @Mock
+    private SupervisionManager mSupervisionManager;
 
     private Context mApplicationContext;
     private FaceStatusUtils mFaceStatusUtils;
@@ -72,13 +81,13 @@
         when(mApplicationContext.getPackageManager()).thenReturn(mPackageManager);
         when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)).thenReturn(true);
         when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FACE)).thenReturn(true);
-        when(mDevicePolicyManager.getProfileOwnerOrDeviceOwnerSupervisionComponent(USER_HANDLE))
-                .thenReturn(COMPONENT_NAME);
         when(mApplicationContext.getSystemService(Context.FINGERPRINT_SERVICE))
                 .thenReturn(mFingerprintManager);
         when(mApplicationContext.getSystemService(Context.DEVICE_POLICY_SERVICE))
                 .thenReturn(mDevicePolicyManager);
         when(mApplicationContext.getSystemService(Context.FACE_SERVICE)).thenReturn(mFaceManager);
+        when(mApplicationContext.getSystemService(Context.SUPERVISION_SERVICE))
+                .thenReturn(mSupervisionManager);
         mFaceStatusUtils = new FaceStatusUtils(mApplicationContext, mFaceManager, USER_ID);
     }
 
@@ -129,7 +138,10 @@
     }
 
     @Test
+    @DisableFlags(android.app.supervision.flags.Flags.FLAG_DEPRECATE_DPM_SUPERVISION_APIS)
     public void getDisabledAdmin_whenFaceDisabled_returnsEnforcedAdmin() {
+        when(mDevicePolicyManager.getProfileOwnerOrDeviceOwnerSupervisionComponent(USER_HANDLE))
+                .thenReturn(COMPONENT_NAME);
         when(mDevicePolicyManager.getKeyguardDisabledFeatures(COMPONENT_NAME))
                 .thenReturn(DevicePolicyManager.KEYGUARD_DISABLE_FACE);
 
@@ -140,6 +152,19 @@
     }
 
     @Test
+    @EnableFlags(android.app.supervision.flags.Flags.FLAG_DEPRECATE_DPM_SUPERVISION_APIS)
+    public void getDisabledAdmin_whenFaceDisabled_returnsRestriction() {
+        when(mSupervisionManager.isSupervisionEnabledForUser(USER_ID)).thenReturn(true);
+        when(mDevicePolicyManager.getKeyguardDisabledFeatures(null))
+                .thenReturn(DevicePolicyManager.KEYGUARD_DISABLE_FACE);
+
+        final RestrictedLockUtils.EnforcedAdmin admin = mFaceStatusUtils.getDisablingAdmin();
+
+        assertThat(admin.enforcedRestriction).isEqualTo(UserManager.DISALLOW_BIOMETRIC);
+        assertThat(admin.user).isEqualTo(USER_HANDLE);
+    }
+
+    @Test
     public void getDisabledAdmin_withFaceEnabled_returnsNull() {
         when(mDevicePolicyManager.getKeyguardDisabledFeatures(COMPONENT_NAME)).thenReturn(0);
 
diff --git a/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintStatusUtilsTest.java b/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintStatusUtilsTest.java
index 450adc6..375c1ff 100644
--- a/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintStatusUtilsTest.java
+++ b/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintStatusUtilsTest.java
@@ -23,6 +23,7 @@
 import static org.mockito.Mockito.when;
 
 import android.app.admin.DevicePolicyManager;
+import android.app.supervision.SupervisionManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.PackageManager;
@@ -31,6 +32,9 @@
 import android.hardware.fingerprint.FingerprintManager;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
 
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -40,6 +44,7 @@
 import com.android.settingslib.utils.StringUtil;
 
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -51,12 +56,14 @@
 @RunWith(AndroidJUnit4.class)
 public class FingerprintStatusUtilsTest {
 
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
     private static final ComponentName COMPONENT_NAME =
             new ComponentName("package", "class");
     private static final int USER_ID = UserHandle.myUserId();
     private static final UserHandle USER_HANDLE = new UserHandle(USER_ID);
 
-
     @Mock
     private PackageManager mPackageManager;
     @Mock
@@ -65,6 +72,8 @@
     private FingerprintManager mFingerprintManager;
     @Mock
     private FaceManager mFaceManager;
+    @Mock
+    private SupervisionManager mSupervisionManager;
 
     private Context mApplicationContext;
     private FingerprintStatusUtils mFingerprintStatusUtils;
@@ -76,13 +85,13 @@
         when(mApplicationContext.getPackageManager()).thenReturn(mPackageManager);
         when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)).thenReturn(true);
         when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FACE)).thenReturn(true);
-        when(mDevicePolicyManager.getProfileOwnerOrDeviceOwnerSupervisionComponent(USER_HANDLE))
-                .thenReturn(COMPONENT_NAME);
         when(mApplicationContext.getSystemService(Context.FINGERPRINT_SERVICE))
                 .thenReturn(mFingerprintManager);
         when(mApplicationContext.getSystemService(Context.DEVICE_POLICY_SERVICE))
                 .thenReturn(mDevicePolicyManager);
         when(mApplicationContext.getSystemService(Context.FACE_SERVICE)).thenReturn(mFaceManager);
+        when(mApplicationContext.getSystemService(Context.SUPERVISION_SERVICE))
+                .thenReturn(mSupervisionManager);
         mFingerprintStatusUtils =
                 new FingerprintStatusUtils(mApplicationContext, mFingerprintManager, USER_ID);
     }
@@ -134,7 +143,10 @@
     }
 
     @Test
+    @DisableFlags(android.app.supervision.flags.Flags.FLAG_DEPRECATE_DPM_SUPERVISION_APIS)
     public void getDisabledAdmin_whenFingerprintDisabled_returnsEnforcedAdmin() {
+        when(mDevicePolicyManager.getProfileOwnerOrDeviceOwnerSupervisionComponent(USER_HANDLE))
+                .thenReturn(COMPONENT_NAME);
         when(mDevicePolicyManager.getKeyguardDisabledFeatures(COMPONENT_NAME))
                 .thenReturn(DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT);
 
@@ -146,6 +158,20 @@
     }
 
     @Test
+    @EnableFlags(android.app.supervision.flags.Flags.FLAG_DEPRECATE_DPM_SUPERVISION_APIS)
+    public void getDisabledAdmin_whenFingerprintDisabled_returnsRestriction() {
+        when(mSupervisionManager.isSupervisionEnabledForUser(USER_ID)).thenReturn(true);
+        when(mDevicePolicyManager.getKeyguardDisabledFeatures(null))
+                .thenReturn(DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT);
+
+        final RestrictedLockUtils.EnforcedAdmin admin =
+                mFingerprintStatusUtils.getDisablingAdmin();
+
+        assertThat(admin.enforcedRestriction).isEqualTo(UserManager.DISALLOW_BIOMETRIC);
+        assertThat(admin.user).isEqualTo(USER_HANDLE);
+    }
+
+    @Test
     public void getDisabledAdmin_withFingerprintEnabled_returnsNull() {
         when(mDevicePolicyManager.getKeyguardDisabledFeatures(COMPONENT_NAME)).thenReturn(0);
 
diff --git a/tests/unit/src/com/android/settings/connecteddevice/display/ExternalDisplayPreferenceFragmentTest.java b/tests/unit/src/com/android/settings/connecteddevice/display/ExternalDisplayPreferenceFragmentTest.java
index 10ddd87..d22dbae 100644
--- a/tests/unit/src/com/android/settings/connecteddevice/display/ExternalDisplayPreferenceFragmentTest.java
+++ b/tests/unit/src/com/android/settings/connecteddevice/display/ExternalDisplayPreferenceFragmentTest.java
@@ -17,7 +17,6 @@
 
 import static android.view.Display.INVALID_DISPLAY;
 
-import static com.android.settings.connecteddevice.display.ExternalDisplayPreferenceFragment.PREVIOUSLY_SHOWN_LIST_KEY;
 import static com.android.settings.connecteddevice.display.ExternalDisplayPreferenceFragment.DISPLAYS_LIST_PREFERENCE_KEY;
 import static com.android.settings.connecteddevice.display.ExternalDisplayPreferenceFragment.EXTERNAL_DISPLAY_CHANGE_RESOLUTION_FOOTER_RESOURCE;
 import static com.android.settings.connecteddevice.display.ExternalDisplayPreferenceFragment.EXTERNAL_DISPLAY_NOT_FOUND_FOOTER_RESOURCE;
@@ -26,8 +25,13 @@
 import static com.android.settings.connecteddevice.display.ExternalDisplayPreferenceFragment.EXTERNAL_DISPLAY_ROTATION_KEY;
 import static com.android.settings.connecteddevice.display.ExternalDisplayPreferenceFragment.EXTERNAL_DISPLAY_ROTATION_TITLE_RESOURCE;
 import static com.android.settings.connecteddevice.display.ExternalDisplayPreferenceFragment.EXTERNAL_DISPLAY_SETTINGS_RESOURCE;
+import static com.android.settings.connecteddevice.display.ExternalDisplayPreferenceFragment.EXTERNAL_DISPLAY_SIZE_PREFERENCE_KEY;
+import static com.android.settings.connecteddevice.display.ExternalDisplayPreferenceFragment.EXTERNAL_DISPLAY_SIZE_SUMMARY_RESOURCE;
+import static com.android.settings.connecteddevice.display.ExternalDisplayPreferenceFragment.EXTERNAL_DISPLAY_SIZE_TITLE_RESOURCE;
 import static com.android.settings.connecteddevice.display.ExternalDisplayPreferenceFragment.EXTERNAL_DISPLAY_USE_PREFERENCE_KEY;
 import static com.android.settings.connecteddevice.display.ExternalDisplayPreferenceFragment.EXTERNAL_DISPLAY_USE_TITLE_RESOURCE;
+import static com.android.settings.connecteddevice.display.ExternalDisplayPreferenceFragment.PREVIOUSLY_SHOWN_LIST_KEY;
+import static com.android.settings.flags.Flags.FLAG_DISPLAY_SIZE_CONNECTED_DISPLAY_SETTING;
 import static com.android.settings.flags.Flags.FLAG_DISPLAY_TOPOLOGY_PANE_IN_DISPLAY_LIST;
 import static com.android.settingslib.widget.FooterPreference.KEY_FOOTER;
 
@@ -207,6 +211,29 @@
 
     @Test
     @UiThreadTest
+    public void testShowEnabledDisplay_OnlyOneDisplayAvailable_displaySizeDisabled() {
+        mFlags.setFlag(FLAG_DISPLAY_SIZE_CONNECTED_DISPLAY_SETTING, false);
+        doReturn(true).when(mMockedInjector).isDisplayEnabled(any());
+        // Only one display available
+        doReturn(new Display[] {mDisplays[1]}).when(mMockedInjector).getAllDisplays();
+        // Init
+        initFragment();
+        mHandler.flush();
+        PreferenceCategory list = mPreferenceScreen.findPreference(DISPLAYS_LIST_PREFERENCE_KEY);
+        assertThat(list).isNull();
+        var pref = mPreferenceScreen.findPreference(EXTERNAL_DISPLAY_RESOLUTION_PREFERENCE_KEY);
+        assertThat(pref).isNotNull();
+        pref = mPreferenceScreen.findPreference(EXTERNAL_DISPLAY_ROTATION_KEY);
+        assertThat(pref).isNotNull();
+        var footerPref = (FooterPreference) mPreferenceScreen.findPreference(KEY_FOOTER);
+        assertThat(footerPref).isNotNull();
+        var sizePref = mPreferenceScreen.findPreference(EXTERNAL_DISPLAY_SIZE_PREFERENCE_KEY);
+        assertThat(sizePref).isNull();
+        verify(footerPref).setTitle(EXTERNAL_DISPLAY_CHANGE_RESOLUTION_FOOTER_RESOURCE);
+    }
+
+    @Test
+    @UiThreadTest
     public void testShowEnabledDisplay_OnlyOneDisplayAvailable() {
         doReturn(true).when(mMockedInjector).isDisplayEnabled(any());
         // Only one display available
@@ -222,6 +249,8 @@
         assertThat(pref).isNotNull();
         var footerPref = (FooterPreference) mPreferenceScreen.findPreference(KEY_FOOTER);
         assertThat(footerPref).isNotNull();
+        var sizePref = mPreferenceScreen.findPreference(EXTERNAL_DISPLAY_SIZE_PREFERENCE_KEY);
+        assertThat(sizePref).isNotNull();
         verify(footerPref).setTitle(EXTERNAL_DISPLAY_CHANGE_RESOLUTION_FOOTER_RESOURCE);
     }
 
@@ -240,6 +269,8 @@
         assertThat(pref).isNotNull();
         var footerPref = (FooterPreference) mPreferenceScreen.findPreference(KEY_FOOTER);
         assertThat(footerPref).isNotNull();
+        var sizePref = mPreferenceScreen.findPreference(EXTERNAL_DISPLAY_SIZE_PREFERENCE_KEY);
+        assertThat(sizePref).isNotNull();
         verify(footerPref).setTitle(EXTERNAL_DISPLAY_CHANGE_RESOLUTION_FOOTER_RESOURCE);
     }
 
@@ -265,6 +296,8 @@
         assertThat(pref).isNull();
         var footerPref = (FooterPreference) mPreferenceScreen.findPreference(KEY_FOOTER);
         assertThat(footerPref).isNull();
+        var sizePref = mPreferenceScreen.findPreference(EXTERNAL_DISPLAY_SIZE_PREFERENCE_KEY);
+        assertThat(sizePref).isNull();
     }
 
     @Test
@@ -339,6 +372,24 @@
 
     @Test
     @UiThreadTest
+    public void testDisplaySizePreference() {
+        mDisplayIdArg = 1;
+        doReturn(true).when(mMockedInjector).isDisplayEnabled(any());
+        var fragment = initFragment();
+        mHandler.flush();
+        var pref = fragment.getSizePreference(mContext);
+        assertThat(pref.getKey()).isEqualTo(EXTERNAL_DISPLAY_SIZE_PREFERENCE_KEY);
+        assertThat("" + pref.getTitle()).isEqualTo(getText(EXTERNAL_DISPLAY_SIZE_TITLE_RESOURCE));
+        assertThat("" + pref.getSummary())
+                .isEqualTo(getText(EXTERNAL_DISPLAY_SIZE_SUMMARY_RESOURCE));
+        assertThat(pref.isEnabled()).isTrue();
+        assertThat(pref.getOnPreferenceClickListener()).isNotNull();
+        assertThat(pref.getOnPreferenceClickListener().onPreferenceClick(pref)).isTrue();
+        verify(mMockedMetricsLogger).writePreferenceClickMetric(pref);
+    }
+
+    @Test
+    @UiThreadTest
     public void testUseDisplayPreference_EnabledDisplay() {
         mDisplayIdArg = 1;
         doReturn(true).when(mMockedInjector).isDisplayEnabled(any());
diff --git a/tests/unit/src/com/android/settings/connecteddevice/display/ExternalDisplayTestBase.java b/tests/unit/src/com/android/settings/connecteddevice/display/ExternalDisplayTestBase.java
index 874ecbd..ea76118 100644
--- a/tests/unit/src/com/android/settings/connecteddevice/display/ExternalDisplayTestBase.java
+++ b/tests/unit/src/com/android/settings/connecteddevice/display/ExternalDisplayTestBase.java
@@ -16,6 +16,7 @@
 package com.android.settings.connecteddevice.display;
 
 import static com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.VIRTUAL_DISPLAY_PACKAGE_NAME_SYSTEM_PROPERTY;
+import static com.android.settings.flags.Flags.FLAG_DISPLAY_SIZE_CONNECTED_DISPLAY_SETTING;
 import static com.android.settings.flags.Flags.FLAG_DISPLAY_TOPOLOGY_PANE_IN_DISPLAY_LIST;
 import static com.android.settings.flags.Flags.FLAG_RESOLUTION_AND_ENABLE_CONNECTED_DISPLAY_SETTING;
 import static com.android.settings.flags.Flags.FLAG_ROTATION_CONNECTED_DISPLAY_SETTING;
@@ -78,6 +79,7 @@
         mFlags.setFlag(FLAG_DISPLAY_TOPOLOGY_PANE_IN_DISPLAY_LIST, false);
         mFlags.setFlag(FLAG_ROTATION_CONNECTED_DISPLAY_SETTING, true);
         mFlags.setFlag(FLAG_RESOLUTION_AND_ENABLE_CONNECTED_DISPLAY_SETTING, true);
+        mFlags.setFlag(FLAG_DISPLAY_SIZE_CONNECTED_DISPLAY_SETTING, true);
         mDisplays = new Display[] {
                 createDefaultDisplay(), createExternalDisplay(), createOverlayDisplay()};
         doReturn(mDisplays).when(mMockedInjector).getAllDisplays();
diff --git a/tests/unit/src/com/android/settings/safetycenter/FaceSafetySourceTest.java b/tests/unit/src/com/android/settings/safetycenter/FaceSafetySourceTest.java
index f956087..716c21e 100644
--- a/tests/unit/src/com/android/settings/safetycenter/FaceSafetySourceTest.java
+++ b/tests/unit/src/com/android/settings/safetycenter/FaceSafetySourceTest.java
@@ -31,15 +31,17 @@
 import static org.mockito.Mockito.when;
 
 import android.app.admin.DevicePolicyManager;
+import android.app.supervision.SupervisionManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.hardware.face.FaceManager;
 import android.os.UserHandle;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
 import android.platform.test.annotations.RequiresFlagsEnabled;
-import android.platform.test.flag.junit.CheckFlagsRule;
-import android.platform.test.flag.junit.DeviceFlagsValueProvider;
+import android.platform.test.flag.junit.SetFlagsRule;
 import android.safetycenter.SafetyEvent;
 import android.safetycenter.SafetySourceData;
 import android.safetycenter.SafetySourceStatus;
@@ -68,12 +70,13 @@
 public class FaceSafetySourceTest {
 
     private static final ComponentName COMPONENT_NAME = new ComponentName("package", "class");
-    private static final UserHandle USER_HANDLE = new UserHandle(UserHandle.myUserId());
+    private static final int USER_ID = UserHandle.myUserId();
+    private static final UserHandle USER_HANDLE = new UserHandle(USER_ID);
     private static final SafetyEvent EVENT_SOURCE_STATE_CHANGED =
             new SafetyEvent.Builder(SAFETY_EVENT_TYPE_SOURCE_STATE_CHANGED).build();
 
     @Rule
-    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
 
     private Context mApplicationContext;
 
@@ -82,6 +85,7 @@
     @Mock private FaceManager mFaceManager;
     @Mock private LockPatternUtils mLockPatternUtils;
     @Mock private SafetyCenterManagerWrapper mSafetyCenterManagerWrapper;
+    @Mock private SupervisionManager mSupervisionManager;
 
     @Before
     public void setUp() {
@@ -90,11 +94,11 @@
         when(mApplicationContext.getPackageManager()).thenReturn(mPackageManager);
         when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)).thenReturn(true);
         when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FACE)).thenReturn(true);
-        when(mDevicePolicyManager.getProfileOwnerOrDeviceOwnerSupervisionComponent(USER_HANDLE))
-                .thenReturn(COMPONENT_NAME);
         when(mApplicationContext.getSystemService(Context.DEVICE_POLICY_SERVICE))
                 .thenReturn(mDevicePolicyManager);
         when(mApplicationContext.getSystemService(Context.FACE_SERVICE)).thenReturn(mFaceManager);
+        when(mApplicationContext.getSystemService(Context.SUPERVISION_SERVICE))
+                .thenReturn(mSupervisionManager);
         FakeFeatureFactory featureFactory = FakeFeatureFactory.setupForTest();
         when(featureFactory.securityFeatureProvider.getLockPatternUtils(mApplicationContext))
                 .thenReturn(mLockPatternUtils);
@@ -153,7 +157,10 @@
     }
 
     @Test
+    @DisableFlags(android.app.supervision.flags.Flags.FLAG_DEPRECATE_DPM_SUPERVISION_APIS)
     public void setSafetySourceData_withFaceNotEnrolled_whenDisabledByAdmin_setsData() {
+        when(mDevicePolicyManager.getProfileOwnerOrDeviceOwnerSupervisionComponent(USER_HANDLE))
+                .thenReturn(COMPONENT_NAME);
         when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(true);
         when(mFaceManager.isHardwareDetected()).thenReturn(true);
         when(mFaceManager.hasEnrolledTemplates(anyInt())).thenReturn(false);
@@ -168,6 +175,23 @@
     }
 
     @Test
+    @EnableFlags(android.app.supervision.flags.Flags.FLAG_DEPRECATE_DPM_SUPERVISION_APIS)
+    public void setSafetySourceData_withFaceNotEnrolled_whenSupervisionIsOn_setsData() {
+        when(mSupervisionManager.isSupervisionEnabledForUser(USER_ID)).thenReturn(true);
+        when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(true);
+        when(mFaceManager.isHardwareDetected()).thenReturn(true);
+        when(mFaceManager.hasEnrolledTemplates(anyInt())).thenReturn(false);
+        when(mDevicePolicyManager.getKeyguardDisabledFeatures(null))
+                .thenReturn(DevicePolicyManager.KEYGUARD_DISABLE_FACE);
+
+        FaceSafetySource.setSafetySourceData(mApplicationContext, EVENT_SOURCE_STATE_CHANGED);
+
+        assertSafetySourceDisabledDataSetWithSingularSummary(
+                "security_settings_face_preference_title_new",
+                "security_settings_face_preference_summary_none");
+    }
+
+    @Test
     public void setSafetySourceData_withFaceNotEnrolled_whenNotDisabledByAdmin_setsData() {
         when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(true);
         when(mFaceManager.isHardwareDetected()).thenReturn(true);
@@ -183,7 +207,10 @@
     }
 
     @Test
+    @DisableFlags(android.app.supervision.flags.Flags.FLAG_DEPRECATE_DPM_SUPERVISION_APIS)
     public void setSafetySourceData_withFaceEnrolled_whenDisabledByAdmin_setsData() {
+        when(mDevicePolicyManager.getProfileOwnerOrDeviceOwnerSupervisionComponent(USER_HANDLE))
+                .thenReturn(COMPONENT_NAME);
         when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(true);
         when(mFaceManager.isHardwareDetected()).thenReturn(true);
         when(mFaceManager.hasEnrolledTemplates(anyInt())).thenReturn(true);
@@ -198,6 +225,23 @@
     }
 
     @Test
+    @EnableFlags(android.app.supervision.flags.Flags.FLAG_DEPRECATE_DPM_SUPERVISION_APIS)
+    public void setSafetySourceData_withFaceEnrolled_whenSupervisionIsOn_setsData() {
+        when(mSupervisionManager.isSupervisionEnabledForUser(USER_ID)).thenReturn(true);
+        when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(true);
+        when(mFaceManager.isHardwareDetected()).thenReturn(true);
+        when(mFaceManager.hasEnrolledTemplates(anyInt())).thenReturn(true);
+        when(mDevicePolicyManager.getKeyguardDisabledFeatures(null))
+                .thenReturn(DevicePolicyManager.KEYGUARD_DISABLE_FACE);
+
+        FaceSafetySource.setSafetySourceData(mApplicationContext, EVENT_SOURCE_STATE_CHANGED);
+
+        assertSafetySourceDisabledDataSetWithSingularSummary(
+                "security_settings_face_preference_title_new",
+                "security_settings_face_preference_summary");
+    }
+
+    @Test
     public void setSafetySourceData_withFaceEnrolled_whenNotDisabledByAdmin_setsData() {
         when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(true);
         when(mFaceManager.isHardwareDetected()).thenReturn(true);
diff --git a/tests/unit/src/com/android/settings/safetycenter/FingerprintSafetySourceTest.java b/tests/unit/src/com/android/settings/safetycenter/FingerprintSafetySourceTest.java
index 68e5349..a12979c 100644
--- a/tests/unit/src/com/android/settings/safetycenter/FingerprintSafetySourceTest.java
+++ b/tests/unit/src/com/android/settings/safetycenter/FingerprintSafetySourceTest.java
@@ -31,6 +31,7 @@
 import static org.mockito.Mockito.when;
 
 import android.app.admin.DevicePolicyManager;
+import android.app.supervision.SupervisionManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -38,9 +39,10 @@
 import android.hardware.fingerprint.Fingerprint;
 import android.hardware.fingerprint.FingerprintManager;
 import android.os.UserHandle;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
 import android.platform.test.annotations.RequiresFlagsEnabled;
-import android.platform.test.flag.junit.CheckFlagsRule;
-import android.platform.test.flag.junit.DeviceFlagsValueProvider;
+import android.platform.test.flag.junit.SetFlagsRule;
 import android.safetycenter.SafetyEvent;
 import android.safetycenter.SafetySourceData;
 import android.safetycenter.SafetySourceStatus;
@@ -72,12 +74,13 @@
 public class FingerprintSafetySourceTest {
 
     private static final ComponentName COMPONENT_NAME = new ComponentName("package", "class");
-    private static final UserHandle USER_HANDLE = new UserHandle(UserHandle.myUserId());
+    private static final int USER_ID = UserHandle.myUserId();
+    private static final UserHandle USER_HANDLE = new UserHandle(USER_ID);
     private static final SafetyEvent EVENT_SOURCE_STATE_CHANGED =
             new SafetyEvent.Builder(SAFETY_EVENT_TYPE_SOURCE_STATE_CHANGED).build();
 
     @Rule
-    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
 
     private Context mApplicationContext;
 
@@ -86,6 +89,7 @@
     @Mock private FingerprintManager mFingerprintManager;
     @Mock private LockPatternUtils mLockPatternUtils;
     @Mock private SafetyCenterManagerWrapper mSafetyCenterManagerWrapper;
+    @Mock private SupervisionManager mSupervisionManager;
 
     @Before
     public void setUp() {
@@ -94,12 +98,12 @@
         when(mApplicationContext.getPackageManager()).thenReturn(mPackageManager);
         when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)).thenReturn(true);
         when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FACE)).thenReturn(true);
-        when(mDevicePolicyManager.getProfileOwnerOrDeviceOwnerSupervisionComponent(USER_HANDLE))
-                .thenReturn(COMPONENT_NAME);
         when(mApplicationContext.getSystemService(Context.FINGERPRINT_SERVICE))
                 .thenReturn(mFingerprintManager);
         when(mApplicationContext.getSystemService(Context.DEVICE_POLICY_SERVICE))
                 .thenReturn(mDevicePolicyManager);
+        when(mApplicationContext.getSystemService(Context.SUPERVISION_SERVICE))
+                .thenReturn(mSupervisionManager);
         FakeFeatureFactory featureFactory = FakeFeatureFactory.setupForTest();
         when(featureFactory.securityFeatureProvider.getLockPatternUtils(mApplicationContext))
                 .thenReturn(mLockPatternUtils);
@@ -166,7 +170,10 @@
     }
 
     @Test
+    @DisableFlags(android.app.supervision.flags.Flags.FLAG_DEPRECATE_DPM_SUPERVISION_APIS)
     public void setSafetySourceData_withFingerprintNotEnrolled_whenDisabledByAdmin_setsData() {
+        when(mDevicePolicyManager.getProfileOwnerOrDeviceOwnerSupervisionComponent(USER_HANDLE))
+                .thenReturn(COMPONENT_NAME);
         when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(true);
         when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
         when(mFingerprintManager.hasEnrolledFingerprints(anyInt())).thenReturn(false);
@@ -182,6 +189,24 @@
     }
 
     @Test
+    @EnableFlags(android.app.supervision.flags.Flags.FLAG_DEPRECATE_DPM_SUPERVISION_APIS)
+    public void setSafetySourceData_withFingerprintNotEnrolled_whenSupervisionIsOn_setsData() {
+        when(mSupervisionManager.isSupervisionEnabledForUser(USER_ID)).thenReturn(true);
+        when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(true);
+        when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
+        when(mFingerprintManager.hasEnrolledFingerprints(anyInt())).thenReturn(false);
+        when(mDevicePolicyManager.getKeyguardDisabledFeatures(null))
+                .thenReturn(DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT);
+
+        FingerprintSafetySource.setSafetySourceData(
+                mApplicationContext, EVENT_SOURCE_STATE_CHANGED);
+
+        assertSafetySourceDisabledDataSetWithSingularSummary(
+                "security_settings_fingerprint",
+                "security_settings_fingerprint_preference_summary_none");
+    }
+
+    @Test
     public void setSafetySourceData_withFingerprintNotEnrolled_whenNotDisabledByAdmin_setsData() {
         when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(true);
         when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
@@ -198,8 +223,11 @@
     }
 
     @Test
+    @DisableFlags(android.app.supervision.flags.Flags.FLAG_DEPRECATE_DPM_SUPERVISION_APIS)
     public void setSafetySourceData_withFingerprintsEnrolled_whenDisabledByAdmin_setsData() {
         int enrolledFingerprintsCount = 2;
+        when(mDevicePolicyManager.getProfileOwnerOrDeviceOwnerSupervisionComponent(USER_HANDLE))
+                .thenReturn(COMPONENT_NAME);
         when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(true);
         when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
         when(mFingerprintManager.hasEnrolledFingerprints(anyInt())).thenReturn(true);
@@ -218,6 +246,28 @@
     }
 
     @Test
+    @EnableFlags(android.app.supervision.flags.Flags.FLAG_DEPRECATE_DPM_SUPERVISION_APIS)
+    public void setSafetySourceData_withFingerprintsEnrolled_whenSupervisionIsOn_setsData() {
+        int enrolledFingerprintsCount = 2;
+        when(mSupervisionManager.isSupervisionEnabledForUser(USER_ID)).thenReturn(true);
+        when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(true);
+        when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
+        when(mFingerprintManager.hasEnrolledFingerprints(anyInt())).thenReturn(true);
+        when(mFingerprintManager.getEnrolledFingerprints(anyInt()))
+                .thenReturn(createFingerprintList(enrolledFingerprintsCount));
+        when(mDevicePolicyManager.getKeyguardDisabledFeatures(null))
+                .thenReturn(DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT);
+
+        FingerprintSafetySource.setSafetySourceData(
+                mApplicationContext, EVENT_SOURCE_STATE_CHANGED);
+
+        assertSafetySourceDisabledDataSetWithPluralSummary(
+                "security_settings_fingerprint",
+                "security_settings_fingerprint_preference_summary",
+                enrolledFingerprintsCount);
+    }
+
+    @Test
     public void setSafetySourceData_withFingerprintsEnrolled_whenNotDisabledByAdmin_setsData() {
         int enrolledFingerprintsCount = 2;
         when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(true);