diff --git a/common.mk b/common.mk
index 497be51..57b6476 100644
--- a/common.mk
+++ b/common.mk
@@ -239,7 +239,6 @@ PRODUCT_PACKAGES += \
     SettingsResCommon \
     SettingsResSamsung \
     SystemUIResCommon \
-    TelecommResCommon \
     TelephonyResCommon \
     WifiResCommon \
     WifiResTarget \
diff --git a/overlay/CarrierConfigResCommon/Android.bp b/overlay/CarrierConfigResCommon/Android.bp
index eb5d8c5..c39fe2d 100644
--- a/overlay/CarrierConfigResCommon/Android.bp
+++ b/overlay/CarrierConfigResCommon/Android.bp
@@ -1,11 +1,10 @@
 //
-// Copyright (C) 2023 The LineageOS Project
-//
+// SPDX-FileCopyrightText: 2025 The LineageOS Project
 // SPDX-License-Identifier: Apache-2.0
 //
 
 runtime_resource_overlay {
     name: "CarrierConfigResCommon",
-    aaptflags: ["--keep-raw-values"],
     vendor: true,
+    aaptflags: ["--keep-raw-values"],
 }
diff --git a/overlay/CarrierConfigResCommon/AndroidManifest.xml b/overlay/CarrierConfigResCommon/AndroidManifest.xml
index 2c4cb23..59b8880 100644
--- a/overlay/CarrierConfigResCommon/AndroidManifest.xml
+++ b/overlay/CarrierConfigResCommon/AndroidManifest.xml
@@ -1,13 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2023 The LineageOS Project
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.carrierconfig.overlay.common">
-
-    <overlay
-        android:isStatic="true"
-        android:priority="100"
-        android:targetPackage="com.android.carrierconfig" />
+    <overlay android:targetPackage="com.android.carrierconfig"
+                   android:isStatic="true"
+                   android:priority="100"/>
 </manifest>
diff --git a/overlay/CarrierConfigResCommon/res/xml/vendor.xml b/overlay/CarrierConfigResCommon/res/xml/vendor.xml
index 9e01e27..66ec7dc 100644
--- a/overlay/CarrierConfigResCommon/res/xml/vendor.xml
+++ b/overlay/CarrierConfigResCommon/res/xml/vendor.xml
@@ -44,16 +44,14 @@
         <boolean name="carrier_cross_sim_ims_available_bool" value="true" />
         <boolean name="carrier_b2c_enriched_calling_supported_bool" value="false" />
         <boolean name="carrier_call_progress_notification" value="true" />
-        <boolean name="dtmf_type_enabled_bool" value="true" />
-        <boolean name="csp_enabled_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="001" mnc="01">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="ignore_data_enabled_changed_for_video_calls" value="true" />
-        <string name="5g_icon_configuration_string">connected_mmwave:5GUWB,connected:5g,not_restricted:None,restricted:None</string>
         <boolean name="support_adhoc_conference_calls_bool" value="true" />
         <boolean name="support_add_conference_participants_bool" value="true" />
+        <boolean name="hide_enabled_5g_bool" value="false" />
     </carrier_config>
     <carrier_config mcc="202" mnc="01">
         <boolean name="carrier_volte_available_bool" value="true" />
@@ -101,11 +99,15 @@
         <boolean name="config_disable_clir_over_ut" value="true" />
         <boolean name="config_enable_video_crbt" value="true" />
         <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
+        <boolean name="support_video_conference_call_bool" value="false" />
         <string-array name="carrier_metered_apn_types_strings" num="3">
             <item value="default" />
             <item value="dun" />
             <item value="supl" />
         </string-array>
+        <boolean name="allow_ut_when_wifi_on_bool" value="true" />
+        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
+        <boolean name="vonr_setting_visibility_bool" value="false" />
     </carrier_config>
     <carrier_config mcc="204" mnc="16">
         <boolean name="carrier_volte_available_bool" value="true" />
@@ -285,6 +287,20 @@
         <boolean name="editable_wfc_roaming_mode_bool" value="true" />
         <int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
     </carrier_config>
+    <carrier_config mcc="232" mnc="05">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <int name="carrier_default_wfc_ims_mode_int" value="10" />
+        <int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
+        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true" />
+        <boolean name="editable_wfc_mode_bool" value="true" />
+        <boolean name="editable_wfc_roaming_mode_bool" value="true" />
+        <boolean name="carrier_wfc_supports_ims_preferred_bool" value="true" />
+        <boolean name="vonr_enabled_bool" value="true" />
+        <boolean name="vonr_setting_visibility_bool" value="false" />
+    </carrier_config>
     <carrier_config mcc="232" mnc="07">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -294,6 +310,20 @@
         <int name="carrier_default_wfc_ims_mode_int" value="1" />
         <int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
     </carrier_config>
+    <carrier_config mcc="232" mnc="10">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <int name="carrier_default_wfc_ims_mode_int" value="10" />
+        <int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
+        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true" />
+        <boolean name="editable_wfc_mode_bool" value="true" />
+        <boolean name="editable_wfc_roaming_mode_bool" value="true" />
+        <boolean name="carrier_wfc_supports_ims_preferred_bool" value="true" />
+        <boolean name="vonr_enabled_bool" value="true" />
+        <boolean name="vonr_setting_visibility_bool" value="false" />
+    </carrier_config>
     <carrier_config mcc="233" mnc="02">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -442,6 +472,10 @@
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
+    <carrier_config mcc="244" mnc="083">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+    </carrier_config>
     <carrier_config mcc="244" mnc="91">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -452,6 +486,14 @@
     <carrier_config mcc="246" mnc="01">
         <boolean name="carrier_volte_available_bool" value="true" />
     </carrier_config>
+    <carrier_config mcc="246" mnc="81">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+    </carrier_config>
+    <carrier_config mcc="246" mnc="081">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+    </carrier_config>
     <carrier_config mcc="248" mnc="01">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -463,6 +505,30 @@
     <carrier_config mcc="250" mnc="02">
         <boolean name="carrier_volte_available_bool" value="true" />
     </carrier_config>
+    <carrier_config mcc="254" mnc="001">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+    </carrier_config>
+    <carrier_config mcc="254" mnc="002">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+    </carrier_config>
+    <carrier_config mcc="254" mnc="003">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+    </carrier_config>
+    <carrier_config mcc="254" mnc="004">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+    </carrier_config>
+    <carrier_config mcc="254" mnc="005">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+    </carrier_config>
+    <carrier_config mcc="254" mnc="006">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+    </carrier_config>
     <carrier_config mcc="259" mnc="01">
         <boolean name="fallback_sms_not_allowed_in_roaming" value="true" />
     </carrier_config>
@@ -1324,6 +1390,16 @@
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="check_mobile_data_for_cf" value="true" />
     </carrier_config>
+    <carrier_config mcc="454" mnc="12">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+    </carrier_config>
+    <carrier_config mcc="454" mnc="13">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+    </carrier_config>
     <carrier_config mcc="454" mnc="31">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
@@ -1347,7 +1423,6 @@
             <item value="dun" />
             <item value="supl" />
         </string-array>
-        <boolean name="config_update_service_status" value="true" />
         <boolean name="vonr_enabled_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="455" mnc="07">
@@ -1368,7 +1443,6 @@
             <item value="dun" />
             <item value="supl" />
         </string-array>
-        <boolean name="config_update_service_status" value="true" />
         <boolean name="vonr_enabled_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="460" mnc="00">
@@ -1377,6 +1451,7 @@
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="check_mobile_data_for_cf" value="true" />
+        <boolean name="disable_supplementary_services_in_airplane_mode_bool" value="true" />
         <boolean name="config_disable_outgoing_callbarring_over_ims" value="true" />
         <boolean name="config_disable_change_password_over_ims" value="true" />
         <boolean name="config_spn_override_enabled" value="true" />
@@ -1401,7 +1476,7 @@
         </string-array>
         <boolean name="config_show_srvcc_toast" value="true" />
         <boolean name="ims_call_type_enabled" value="true" />
-        <boolean name="config_enable_conference_dialer" value="true" />
+        <boolean name="config_enable_conference_dialer_features" value="true" />
         <boolean name="config_conference_call_show_participant_status" value="true" />
         <boolean name="ignore_data_enabled_changed_for_video_calls" value="true" />
         <boolean name="add_multi_participants_enabled" value="true" />
@@ -1415,18 +1490,16 @@
         <boolean name="ignore_reset_ut_capability_bool" value="true" />
         <boolean name="carrier_parse_number_on_forward_call_bool" value="true" />
         <string name="carrier_name_string">China Mobile</string>
-        <boolean name="config_update_service_status" value="true" />
         <boolean name="support_video_conference_call_bool" value="false" />
-        <boolean name="allow_add_call_during_video_call" value="false" />
-        <boolean name="allow_hold_video_call_bool" value="false" />
+        <boolean name="allow_add_call_during_video_call" value="true" />
+        <boolean name="allow_hold_video_call_bool" value="true" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
-        <boolean name="hide_enabled_5g_bool" value="false" />
         <boolean name="support_adhoc_conference_calls_bool" value="true" />
         <boolean name="support_add_conference_participants_bool" value="true" />
         <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
         <boolean name="carrier_video_crs_supported_bool" value="true" />
         <string-array name="carrier_support_video_service_numbers" num="2">
-            <item value="0532100860086" />
+            <item value="\ 0532100860086" />
             <item value="0201008616" />
         </string-array>
         <boolean name="carrier_support_send_media_configs_to_radio_layer_bool" value="true" />
@@ -1437,6 +1510,8 @@
         <boolean name="vonr_enabled_bool" value="true" />
         <boolean name="carrier_data_channel_supported_bool" value="true" />
         <boolean name="carrier_video_online_service_supported_bool" value="true" />
+        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
+        <boolean name="vonr_setting_visibility_bool" value="false" />
     </carrier_config>
     <carrier_config mcc="460" mnc="01">
         <boolean name="notify_video_call_failed" value="true" />
@@ -1445,6 +1520,7 @@
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="config_spn_override_enabled" value="true" />
         <boolean name="allow_emergency_numbers_in_call_log_bool" value="true" />
+        <boolean name="show_4g_for_lte_data_icon_bool" value="true" />
         <string-array name="apn_hide_rule_strings_array" num="2">
             <item value="type" />
             <item value="supl,ims" />
@@ -1458,13 +1534,13 @@
         <boolean name="carrier_parse_number_on_forward_call_bool" value="true" />
         <boolean name="carrier_name_override_bool" value="true" />
         <string name="carrier_name_string">China Unicom</string>
-        <boolean name="config_update_service_status" value="true" />
+        <boolean name="support_video_conference_call_bool" value="false" />
         <boolean name="config_update_volte_icon" value="true" />
         <boolean name="check_mobile_data_for_cf" value="true" />
+        <boolean name="disable_supplementary_services_in_airplane_mode_bool" value="true" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
         <boolean name="config_enable_video_crbt" value="true" />
         <boolean name="config_disable_clir_over_ut" value="true" />
-        <boolean name="hide_enabled_5g_bool" value="false" />
         <boolean name="call_barring_visibility_bool" value="false" />
         <boolean name="allow_add_call_during_video_call" value="false" />
         <boolean name="allow_hold_video_call_bool" value="false" />
@@ -1482,6 +1558,7 @@
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="check_mobile_data_for_cf" value="true" />
+        <boolean name="disable_supplementary_services_in_airplane_mode_bool" value="true" />
         <boolean name="config_disable_outgoing_callbarring_over_ims" value="true" />
         <boolean name="config_disable_change_password_over_ims" value="true" />
         <boolean name="config_spn_override_enabled" value="true" />
@@ -1506,7 +1583,7 @@
         </string-array>
         <boolean name="config_show_srvcc_toast" value="true" />
         <boolean name="ims_call_type_enabled" value="true" />
-        <boolean name="config_enable_conference_dialer" value="true" />
+        <boolean name="config_enable_conference_dialer_features" value="true" />
         <boolean name="config_conference_call_show_participant_status" value="true" />
         <boolean name="ignore_data_enabled_changed_for_video_calls" value="true" />
         <boolean name="add_multi_participants_enabled" value="true" />
@@ -1520,18 +1597,16 @@
         <boolean name="ignore_reset_ut_capability_bool" value="true" />
         <boolean name="carrier_parse_number_on_forward_call_bool" value="true" />
         <string name="carrier_name_string">China Mobile</string>
-        <boolean name="config_update_service_status" value="true" />
         <boolean name="support_video_conference_call_bool" value="false" />
-        <boolean name="allow_add_call_during_video_call" value="false" />
-        <boolean name="allow_hold_video_call_bool" value="false" />
+        <boolean name="allow_add_call_during_video_call" value="true" />
+        <boolean name="allow_hold_video_call_bool" value="true" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
-        <boolean name="hide_enabled_5g_bool" value="false" />
         <boolean name="support_adhoc_conference_calls_bool" value="true" />
         <boolean name="support_add_conference_participants_bool" value="true" />
         <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
         <boolean name="carrier_video_crs_supported_bool" value="true" />
         <string-array name="carrier_support_video_service_numbers" num="2">
-            <item value="0532100860086" />
+            <item value="\ 0532100860086" />
             <item value="0201008616" />
         </string-array>
         <boolean name="carrier_support_send_media_configs_to_radio_layer_bool" value="true" />
@@ -1542,12 +1617,15 @@
         <boolean name="vonr_enabled_bool" value="true" />
         <boolean name="carrier_data_channel_supported_bool" value="true" />
         <boolean name="carrier_video_online_service_supported_bool" value="true" />
+        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
+        <boolean name="vonr_setting_visibility_bool" value="false" />
     </carrier_config>
     <carrier_config mcc="460" mnc="03">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="check_mobile_data_for_cf" value="true" />
+        <boolean name="disable_supplementary_services_in_airplane_mode_bool" value="true" />
         <boolean name="ascii_7_bit_support_for_long_message" value="true" />
         <boolean name="cdma_cw_cf_enabled_bool" value="true" />
         <boolean name="allow_emergency_numbers_in_call_log_bool" value="true" />
@@ -1570,18 +1648,17 @@
         <boolean name="ignore_reset_ut_capability_bool" value="true" />
         <boolean name="carrier_parse_number_on_forward_call_bool" value="true" />
         <boolean name="config_auto_retry_cfu_bool" value="true" />
-        <boolean name="config_update_service_status" value="true" />
         <boolean name="allow_add_call_during_video_call" value="false" />
         <boolean name="allow_hold_video_call_bool" value="false" />
         <boolean name="config_common_callsettings_support_bool" value="true" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
         <boolean name="config_enable_video_crbt" value="true" />
         <boolean name="config_disable_clir_over_ut" value="true" />
-        <boolean name="hide_enabled_5g_bool" value="false" />
         <boolean name="call_barring_visibility_bool" value="false" />
         <boolean name="support_swap_after_merge_bool" value="false" />
         <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
         <boolean name="disable_filter_out_conference_host" value="true" />
+        <boolean name="support_video_conference_call_bool" value="false" />
         <int-array name="carrier_nr_availabilities_int_array" num="1">
             <item value="1" />
         </int-array>
@@ -1589,17 +1666,80 @@
         <boolean name="allow_hold_call_during_emergency_bool" value="false" />
         <boolean name="vonr_enabled_bool" value="true" />
         <int name="carrier_default_wfc_ims_mode_int" value="1" />
+        <int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
+        <boolean name="editable_wfc_mode_bool" value="false" />
+        <boolean name="carrier_data_channel_supported_bool" value="true" />
+        <boolean name="allow_ut_when_wifi_on_bool" value="true" />
+        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
+        <boolean name="vonr_setting_visibility_bool" value="false" />
     </carrier_config>
     <carrier_config mcc="460" mnc="04">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
+        <boolean name="check_mobile_data_for_cf" value="true" />
+        <boolean name="disable_supplementary_services_in_airplane_mode_bool" value="true" />
+        <boolean name="config_disable_outgoing_callbarring_over_ims" value="true" />
+        <boolean name="config_disable_change_password_over_ims" value="true" />
+        <boolean name="config_spn_override_enabled" value="true" />
         <boolean name="allow_emergency_numbers_in_call_log_bool" value="true" />
-        <boolean name="config_hide_vt_callforward_option" value="true" />
+        <boolean name="config_disable_clir_over_ut" value="true" />
+        <boolean name="show_video_quality_toast" value="false" />
+        <boolean name="show_call_session_event_toast" value="false" />
+        <boolean name="show_data_usage_toast" value="false" />
+        <string-array name="apn_hide_rule_strings_array" num="2">
+            <item value="type" />
+            <item value="fota,ims" />
+        </string-array>
         <map name="apn_default_values_strings_array">
             <string name="protocol">IPV4V6</string>
             <string name="roaming_protocol">IPV4V6</string>
         </map>
+        <string-array name="carrier_metered_apn_types_strings" num="4">
+            <item value="default" />
+            <item value="dun" />
+            <item value="supl" />
+            <item value="fota" />
+        </string-array>
+        <boolean name="config_show_srvcc_toast" value="true" />
+        <boolean name="ims_call_type_enabled" value="true" />
+        <boolean name="config_enable_conference_dialer_features" value="true" />
+        <boolean name="config_conference_call_show_participant_status" value="true" />
+        <boolean name="ignore_data_enabled_changed_for_video_calls" value="true" />
+        <boolean name="add_multi_participants_enabled" value="true" />
+        <boolean name="add_participant_only_in_conference" value="true" />
+        <boolean name="config_enable_cfu_time" value="true" />
+        <boolean name="support_cancel_modify_call" value="true" />
+        <boolean name="config_enable_video_crbt" value="true" />
+        <boolean name="config_hide_vt_callforward_option" value="true" />
+        <boolean name="disable_filter_out_conference_host" value="true" />
+        <boolean name="identify_high_definition_calls_in_call_log_bool" value="true" />
+        <boolean name="ignore_reset_ut_capability_bool" value="true" />
+        <boolean name="carrier_parse_number_on_forward_call_bool" value="true" />
+        <string name="carrier_name_string">China Mobile</string>
+        <boolean name="support_video_conference_call_bool" value="false" />
+        <boolean name="allow_add_call_during_video_call" value="true" />
+        <boolean name="allow_hold_video_call_bool" value="true" />
+        <boolean name="vilte_data_is_metered_bool" value="false" />
+        <boolean name="support_adhoc_conference_calls_bool" value="true" />
+        <boolean name="support_add_conference_participants_bool" value="true" />
+        <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
+        <boolean name="carrier_video_crs_supported_bool" value="true" />
+        <string-array name="carrier_support_video_service_numbers" num="2">
+            <item value="\ 0532100860086" />
+            <item value="0201008616" />
+        </string-array>
+        <boolean name="carrier_support_send_media_configs_to_radio_layer_bool" value="true" />
         <int-array name="carrier_nr_availabilities_int_array" num="1">
             <item value="1" />
         </int-array>
+        <boolean name="allow_hold_call_during_emergency_bool" value="false" />
+        <boolean name="vonr_enabled_bool" value="true" />
+        <boolean name="carrier_data_channel_supported_bool" value="true" />
+        <boolean name="carrier_video_online_service_supported_bool" value="true" />
+        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
+        <boolean name="vonr_setting_visibility_bool" value="false" />
     </carrier_config>
     <carrier_config mcc="460" mnc="05">
         <boolean name="carrier_volte_available_bool" value="true" />
@@ -1614,16 +1754,22 @@
         <boolean name="config_hide_vt_callforward_option" value="true" />
         <boolean name="ignore_reset_ut_capability_bool" value="true" />
         <boolean name="carrier_parse_number_on_forward_call_bool" value="true" />
-        <boolean name="config_update_service_status" value="true" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
         <boolean name="config_enable_video_crbt" value="true" />
         <boolean name="config_disable_clir_over_ut" value="true" />
-        <boolean name="hide_enabled_5g_bool" value="false" />
         <boolean name="support_swap_after_merge_bool" value="false" />
         <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
         <boolean name="disable_filter_out_conference_host" value="true" />
         <boolean name="carrier_video_crs_supported_bool" value="true" />
+        <boolean name="support_video_conference_call_bool" value="false" />
         <int name="carrier_default_wfc_ims_mode_int" value="1" />
+        <int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
+        <boolean name="editable_wfc_mode_bool" value="false" />
+        <boolean name="carrier_data_channel_supported_bool" value="true" />
+        <boolean name="allow_ut_when_wifi_on_bool" value="true" />
+        <boolean name="disable_supplementary_services_in_airplane_mode_bool" value="true" />
+        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
+        <boolean name="vonr_setting_visibility_bool" value="false" />
     </carrier_config>
     <carrier_config mcc="460" mnc="06">
         <boolean name="notify_video_call_failed" value="true" />
@@ -1632,6 +1778,7 @@
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="config_spn_override_enabled" value="true" />
         <boolean name="allow_emergency_numbers_in_call_log_bool" value="true" />
+        <boolean name="show_4g_for_lte_data_icon_bool" value="true" />
         <map name="apn_default_values_strings_array">
             <string name="protocol">IPV4V6</string>
             <string name="roaming_protocol">IPV4V6</string>
@@ -1641,13 +1788,13 @@
         <boolean name="carrier_parse_number_on_forward_call_bool" value="true" />
         <boolean name="carrier_name_override_bool" value="true" />
         <string name="carrier_name_string">China Unicom</string>
-        <boolean name="config_update_service_status" value="true" />
+        <boolean name="support_video_conference_call_bool" value="false" />
         <boolean name="config_update_volte_icon" value="true" />
         <boolean name="check_mobile_data_for_cf" value="true" />
+        <boolean name="disable_supplementary_services_in_airplane_mode_bool" value="true" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
         <boolean name="config_enable_video_crbt" value="true" />
         <boolean name="config_disable_clir_over_ut" value="true" />
-        <boolean name="hide_enabled_5g_bool" value="false" />
         <boolean name="call_barring_visibility_bool" value="false" />
         <boolean name="allow_add_call_during_video_call" value="false" />
         <boolean name="allow_hold_video_call_bool" value="false" />
@@ -1662,6 +1809,7 @@
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="check_mobile_data_for_cf" value="true" />
+        <boolean name="disable_supplementary_services_in_airplane_mode_bool" value="true" />
         <boolean name="config_disable_outgoing_callbarring_over_ims" value="true" />
         <boolean name="config_disable_change_password_over_ims" value="true" />
         <boolean name="config_spn_override_enabled" value="true" />
@@ -1686,7 +1834,7 @@
         </string-array>
         <boolean name="config_show_srvcc_toast" value="true" />
         <boolean name="ims_call_type_enabled" value="true" />
-        <boolean name="config_enable_conference_dialer" value="true" />
+        <boolean name="config_enable_conference_dialer_features" value="true" />
         <boolean name="config_conference_call_show_participant_status" value="true" />
         <boolean name="ignore_data_enabled_changed_for_video_calls" value="true" />
         <boolean name="add_multi_participants_enabled" value="true" />
@@ -1699,18 +1847,16 @@
         <boolean name="identify_high_definition_calls_in_call_log_bool" value="true" />
         <boolean name="ignore_reset_ut_capability_bool" value="true" />
         <boolean name="carrier_parse_number_on_forward_call_bool" value="true" />
-        <boolean name="config_update_service_status" value="true" />
         <boolean name="support_video_conference_call_bool" value="false" />
-        <boolean name="allow_add_call_during_video_call" value="false" />
-        <boolean name="allow_hold_video_call_bool" value="false" />
+        <boolean name="allow_add_call_during_video_call" value="true" />
+        <boolean name="allow_hold_video_call_bool" value="true" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
-        <boolean name="hide_enabled_5g_bool" value="false" />
         <boolean name="support_adhoc_conference_calls_bool" value="true" />
         <boolean name="support_add_conference_participants_bool" value="true" />
         <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
         <boolean name="carrier_video_crs_supported_bool" value="true" />
         <string-array name="carrier_support_video_service_numbers" num="2">
-            <item value="0532100860086" />
+            <item value="\ 0532100860086" />
             <item value="0201008616" />
         </string-array>
         <boolean name="carrier_support_send_media_configs_to_radio_layer_bool" value="true" />
@@ -1721,6 +1867,8 @@
         <boolean name="vonr_enabled_bool" value="true" />
         <boolean name="carrier_data_channel_supported_bool" value="true" />
         <boolean name="carrier_video_online_service_supported_bool" value="true" />
+        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
+        <boolean name="vonr_setting_visibility_bool" value="false" />
     </carrier_config>
     <carrier_config mcc="460" mnc="08">
         <boolean name="carrier_volte_available_bool" value="true" />
@@ -1728,6 +1876,7 @@
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="check_mobile_data_for_cf" value="true" />
+        <boolean name="disable_supplementary_services_in_airplane_mode_bool" value="true" />
         <boolean name="config_disable_outgoing_callbarring_over_ims" value="true" />
         <boolean name="config_disable_change_password_over_ims" value="true" />
         <boolean name="allow_emergency_numbers_in_call_log_bool" value="true" />
@@ -1751,7 +1900,7 @@
         </string-array>
         <boolean name="config_show_srvcc_toast" value="true" />
         <boolean name="ims_call_type_enabled" value="true" />
-        <boolean name="config_enable_conference_dialer" value="true" />
+        <boolean name="config_enable_conference_dialer_features" value="true" />
         <boolean name="config_conference_call_show_participant_status" value="true" />
         <boolean name="ignore_data_enabled_changed_for_video_calls" value="true" />
         <boolean name="add_multi_participants_enabled" value="true" />
@@ -1764,18 +1913,16 @@
         <boolean name="identify_high_definition_calls_in_call_log_bool" value="true" />
         <boolean name="ignore_reset_ut_capability_bool" value="true" />
         <boolean name="carrier_parse_number_on_forward_call_bool" value="true" />
-        <boolean name="config_update_service_status" value="true" />
         <boolean name="support_video_conference_call_bool" value="false" />
-        <boolean name="allow_add_call_during_video_call" value="false" />
-        <boolean name="allow_hold_video_call_bool" value="false" />
+        <boolean name="allow_add_call_during_video_call" value="true" />
+        <boolean name="allow_hold_video_call_bool" value="true" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
-        <boolean name="hide_enabled_5g_bool" value="false" />
         <boolean name="support_adhoc_conference_calls_bool" value="true" />
         <boolean name="support_add_conference_participants_bool" value="true" />
         <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
         <boolean name="carrier_video_crs_supported_bool" value="true" />
         <string-array name="carrier_support_video_service_numbers" num="2">
-            <item value="0532100860086" />
+            <item value="\ 0532100860086" />
             <item value="0201008616" />
         </string-array>
         <boolean name="carrier_support_send_media_configs_to_radio_layer_bool" value="true" />
@@ -1786,6 +1933,8 @@
         <boolean name="vonr_enabled_bool" value="true" />
         <boolean name="carrier_data_channel_supported_bool" value="true" />
         <boolean name="carrier_video_online_service_supported_bool" value="true" />
+        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
+        <boolean name="vonr_setting_visibility_bool" value="false" />
     </carrier_config>
     <carrier_config mcc="460" mnc="09">
         <boolean name="notify_video_call_failed" value="true" />
@@ -1793,6 +1942,7 @@
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="allow_emergency_numbers_in_call_log_bool" value="true" />
+        <boolean name="show_4g_for_lte_data_icon_bool" value="true" />
         <map name="apn_default_values_strings_array">
             <string name="protocol">IPV4V6</string>
             <string name="roaming_protocol">IPV4V6</string>
@@ -1802,13 +1952,13 @@
         <boolean name="carrier_parse_number_on_forward_call_bool" value="true" />
         <boolean name="carrier_name_override_bool" value="true" />
         <string name="carrier_name_string">China Unicom</string>
-        <boolean name="config_update_service_status" value="true" />
+        <boolean name="support_video_conference_call_bool" value="false" />
         <boolean name="config_update_volte_icon" value="true" />
         <boolean name="check_mobile_data_for_cf" value="true" />
+        <boolean name="disable_supplementary_services_in_airplane_mode_bool" value="true" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
         <boolean name="config_enable_video_crbt" value="true" />
         <boolean name="config_disable_clir_over_ut" value="true" />
-        <boolean name="hide_enabled_5g_bool" value="false" />
         <boolean name="call_barring_visibility_bool" value="false" />
         <boolean name="allow_add_call_during_video_call" value="false" />
         <boolean name="allow_hold_video_call_bool" value="false" />
@@ -1823,6 +1973,7 @@
     <carrier_config mcc="460" mnc="10">
         <boolean name="allow_emergency_numbers_in_call_log_bool" value="true" />
         <boolean name="config_hide_vt_callforward_option" value="true" />
+        <boolean name="show_4g_for_lte_data_icon_bool" value="true" />
         <map name="apn_default_values_strings_array">
             <string name="protocol">IPV4V6</string>
             <string name="roaming_protocol">IPV4V6</string>
@@ -1833,6 +1984,7 @@
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="check_mobile_data_for_cf" value="true" />
+        <boolean name="disable_supplementary_services_in_airplane_mode_bool" value="true" />
         <boolean name="ascii_7_bit_support_for_long_message" value="true" />
         <boolean name="cdma_cw_cf_enabled_bool" value="true" />
         <boolean name="allow_emergency_numbers_in_call_log_bool" value="true" />
@@ -1855,18 +2007,17 @@
         <boolean name="ignore_reset_ut_capability_bool" value="true" />
         <boolean name="carrier_parse_number_on_forward_call_bool" value="true" />
         <boolean name="config_auto_retry_cfu_bool" value="true" />
-        <boolean name="config_update_service_status" value="true" />
         <boolean name="allow_add_call_during_video_call" value="false" />
         <boolean name="allow_hold_video_call_bool" value="false" />
         <boolean name="config_common_callsettings_support_bool" value="true" />
         <boolean name="vilte_data_is_metered_bool" value="false" />
         <boolean name="config_enable_video_crbt" value="true" />
         <boolean name="config_disable_clir_over_ut" value="true" />
-        <boolean name="hide_enabled_5g_bool" value="false" />
         <boolean name="call_barring_visibility_bool" value="false" />
         <boolean name="support_swap_after_merge_bool" value="false" />
         <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
         <boolean name="disable_filter_out_conference_host" value="true" />
+        <boolean name="support_video_conference_call_bool" value="false" />
         <int-array name="carrier_nr_availabilities_int_array" num="1">
             <item value="1" />
         </int-array>
@@ -1874,12 +2025,19 @@
         <boolean name="allow_hold_call_during_emergency_bool" value="false" />
         <boolean name="vonr_enabled_bool" value="true" />
         <int name="carrier_default_wfc_ims_mode_int" value="1" />
+        <int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
+        <boolean name="editable_wfc_mode_bool" value="false" />
+        <boolean name="carrier_data_channel_supported_bool" value="true" />
+        <boolean name="allow_ut_when_wifi_on_bool" value="true" />
+        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
+        <boolean name="vonr_setting_visibility_bool" value="false" />
     </carrier_config>
     <carrier_config mcc="460" mnc="12">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="check_mobile_data_for_cf" value="true" />
+        <boolean name="disable_supplementary_services_in_airplane_mode_bool" value="true" />
         <boolean name="ascii_7_bit_support_for_long_message" value="true" />
         <boolean name="cdma_cw_cf_enabled_bool" value="true" />
         <boolean name="allow_emergency_numbers_in_call_log_bool" value="true" />
@@ -1902,19 +2060,26 @@
         <boolean name="vilte_data_is_metered_bool" value="false" />
         <boolean name="config_enable_video_crbt" value="true" />
         <boolean name="config_disable_clir_over_ut" value="true" />
-        <boolean name="hide_enabled_5g_bool" value="false" />
         <boolean name="call_barring_visibility_bool" value="false" />
         <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
         <boolean name="carrier_video_crs_supported_bool" value="true" />
         <boolean name="allow_hold_call_during_emergency_bool" value="false" />
+        <boolean name="support_video_conference_call_bool" value="false" />
         <int name="carrier_default_wfc_ims_mode_int" value="1" />
+        <int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
+        <boolean name="editable_wfc_mode_bool" value="false" />
+        <boolean name="carrier_data_channel_supported_bool" value="true" />
+        <boolean name="allow_ut_when_wifi_on_bool" value="true" />
+        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
+        <boolean name="vonr_setting_visibility_bool" value="false" />
     </carrier_config>
-    <carrier_config mcc="460" mnc="15">
+    <carrier_config mcc="460" mnc="13">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="check_mobile_data_for_cf" value="true" />
+        <boolean name="disable_supplementary_services_in_airplane_mode_bool" value="true" />
         <boolean name="config_disable_outgoing_callbarring_over_ims" value="true" />
         <boolean name="config_disable_change_password_over_ims" value="true" />
         <boolean name="config_spn_override_enabled" value="true" />
@@ -1939,7 +2104,75 @@
         </string-array>
         <boolean name="config_show_srvcc_toast" value="true" />
         <boolean name="ims_call_type_enabled" value="true" />
-        <boolean name="config_enable_conference_dialer" value="true" />
+        <boolean name="config_enable_conference_dialer_features" value="true" />
+        <boolean name="config_conference_call_show_participant_status" value="true" />
+        <boolean name="ignore_data_enabled_changed_for_video_calls" value="true" />
+        <boolean name="add_multi_participants_enabled" value="true" />
+        <boolean name="add_participant_only_in_conference" value="true" />
+        <boolean name="config_enable_cfu_time" value="true" />
+        <boolean name="support_cancel_modify_call" value="true" />
+        <boolean name="config_enable_video_crbt" value="true" />
+        <boolean name="config_hide_vt_callforward_option" value="true" />
+        <boolean name="disable_filter_out_conference_host" value="true" />
+        <boolean name="identify_high_definition_calls_in_call_log_bool" value="true" />
+        <boolean name="ignore_reset_ut_capability_bool" value="true" />
+        <boolean name="carrier_parse_number_on_forward_call_bool" value="true" />
+        <string name="carrier_name_string">China Mobile</string>
+        <boolean name="support_video_conference_call_bool" value="false" />
+        <boolean name="allow_add_call_during_video_call" value="true" />
+        <boolean name="allow_hold_video_call_bool" value="true" />
+        <boolean name="vilte_data_is_metered_bool" value="false" />
+        <boolean name="support_adhoc_conference_calls_bool" value="true" />
+        <boolean name="support_add_conference_participants_bool" value="true" />
+        <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
+        <boolean name="carrier_video_crs_supported_bool" value="true" />
+        <string-array name="carrier_support_video_service_numbers" num="2">
+            <item value="\ 0532100860086" />
+            <item value="0201008616" />
+        </string-array>
+        <boolean name="carrier_support_send_media_configs_to_radio_layer_bool" value="true" />
+        <int-array name="carrier_nr_availabilities_int_array" num="1">
+            <item value="1" />
+        </int-array>
+        <boolean name="allow_hold_call_during_emergency_bool" value="false" />
+        <boolean name="vonr_enabled_bool" value="true" />
+        <boolean name="carrier_data_channel_supported_bool" value="true" />
+        <boolean name="carrier_video_online_service_supported_bool" value="true" />
+        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
+        <boolean name="vonr_setting_visibility_bool" value="false" />
+    </carrier_config>
+    <carrier_config mcc="460" mnc="15">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
+        <boolean name="check_mobile_data_for_cf" value="true" />
+        <boolean name="disable_supplementary_services_in_airplane_mode_bool" value="true" />
+        <boolean name="config_disable_outgoing_callbarring_over_ims" value="true" />
+        <boolean name="config_disable_change_password_over_ims" value="true" />
+        <boolean name="config_spn_override_enabled" value="true" />
+        <boolean name="allow_emergency_numbers_in_call_log_bool" value="true" />
+        <boolean name="config_disable_clir_over_ut" value="true" />
+        <boolean name="show_video_quality_toast" value="false" />
+        <boolean name="show_call_session_event_toast" value="false" />
+        <boolean name="show_data_usage_toast" value="false" />
+        <string-array name="apn_hide_rule_strings_array" num="2">
+            <item value="type" />
+            <item value="fota,ims" />
+        </string-array>
+        <map name="apn_default_values_strings_array">
+            <string name="protocol">IPV4V6</string>
+            <string name="roaming_protocol">IPV4V6</string>
+        </map>
+        <string-array name="carrier_metered_apn_types_strings" num="4">
+            <item value="default" />
+            <item value="dun" />
+            <item value="supl" />
+            <item value="fota" />
+        </string-array>
+        <boolean name="config_show_srvcc_toast" value="true" />
+        <boolean name="ims_call_type_enabled" value="true" />
+        <boolean name="config_enable_conference_dialer_features" value="true" />
         <boolean name="config_conference_call_show_participant_status" value="true" />
         <boolean name="ignore_data_enabled_changed_for_video_calls" value="true" />
         <boolean name="add_multi_participants_enabled" value="true" />
@@ -1953,7 +2186,6 @@
         <boolean name="ignore_reset_ut_capability_bool" value="true" />
         <boolean name="carrier_parse_number_on_forward_call_bool" value="true" />
         <string name="carrier_name_string">China Broadcasting</string>
-        <boolean name="config_update_service_status" value="true" />
         <boolean name="support_video_conference_call_bool" value="false" />
         <boolean name="allow_add_call_during_video_call" value="false" />
         <boolean name="allow_hold_video_call_bool" value="false" />
@@ -2381,48 +2613,6 @@
         <boolean name="carrier_allow_turnoff_ims_bool" value="false" />
         <boolean name="use_sms_callback_mode_bool" value="true" />
         <boolean name="editable_enhanced_4g_lte_bool" value="false" />
-    </carrier_config>
-    <carrier_config device="kona" mcc="311" mnc="480">
-        <boolean name="show_rtt_visibility_setting_bool" value="true" />
-        <boolean name="ignore_rtt_mode_setting_bool" value="true" />
-        <int name="default_rtt_mode_int" value="1" />
-    </carrier_config>
-    <carrier_config device="lito" mcc="311" mnc="480">
-        <boolean name="show_rtt_visibility_setting_bool" value="true" />
-        <boolean name="ignore_rtt_mode_setting_bool" value="true" />
-        <int name="default_rtt_mode_int" value="1" />
-    </carrier_config>
-    <carrier_config device="atoll" mcc="311" mnc="480">
-        <boolean name="show_rtt_visibility_setting_bool" value="true" />
-        <boolean name="ignore_rtt_mode_setting_bool" value="true" />
-        <int name="default_rtt_mode_int" value="1" />
-    </carrier_config>
-    <carrier_config device="lahaina" mcc="311" mnc="480">
-        <boolean name="show_rtt_visibility_setting_bool" value="true" />
-        <boolean name="ignore_rtt_mode_setting_bool" value="true" />
-        <int name="default_rtt_mode_int" value="1" />
-    </carrier_config>
-    <carrier_config device="holi" mcc="311" mnc="480">
-        <boolean name="show_rtt_visibility_setting_bool" value="true" />
-        <boolean name="ignore_rtt_mode_setting_bool" value="true" />
-        <int name="default_rtt_mode_int" value="1" />
-    </carrier_config>
-    <carrier_config device="taro" mcc="311" mnc="480">
-        <boolean name="show_rtt_visibility_setting_bool" value="true" />
-        <boolean name="ignore_rtt_mode_setting_bool" value="true" />
-        <int name="default_rtt_mode_int" value="1" />
-    </carrier_config>
-    <carrier_config device="kalama" mcc="311" mnc="480">
-        <boolean name="show_rtt_visibility_setting_bool" value="true" />
-        <boolean name="ignore_rtt_mode_setting_bool" value="true" />
-        <int name="default_rtt_mode_int" value="1" />
-    </carrier_config>
-    <carrier_config device="parrot" mcc="311" mnc="480">
-        <boolean name="show_rtt_visibility_setting_bool" value="true" />
-        <boolean name="ignore_rtt_mode_setting_bool" value="true" />
-        <int name="default_rtt_mode_int" value="1" />
-    </carrier_config>
-    <carrier_config device="pineapple" mcc="311" mnc="480">
         <boolean name="show_rtt_visibility_setting_bool" value="true" />
         <boolean name="ignore_rtt_mode_setting_bool" value="true" />
         <int name="default_rtt_mode_int" value="1" />
diff --git a/overlay/FrameworksResCommon/Android.bp b/overlay/FrameworksResCommon/Android.bp
index bc94ac0..a37ee15 100644
--- a/overlay/FrameworksResCommon/Android.bp
+++ b/overlay/FrameworksResCommon/Android.bp
@@ -1,6 +1,5 @@
 //
-// Copyright (C) 2023 The LineageOS Project
-//
+// SPDX-FileCopyrightText: 2025 The LineageOS Project
 // SPDX-License-Identifier: Apache-2.0
 //
 
diff --git a/overlay/FrameworksResCommon/AndroidManifest.xml b/overlay/FrameworksResCommon/AndroidManifest.xml
index 252ab24..c052a1d 100644
--- a/overlay/FrameworksResCommon/AndroidManifest.xml
+++ b/overlay/FrameworksResCommon/AndroidManifest.xml
@@ -1,12 +1,10 @@
 <!--
-     Copyright (C) 2023 The LineageOS Project
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="android.overlay.common">
-
-    <overlay
-        android:isStatic="true"
-        android:priority="100"
-        android:targetPackage="android" />
+    <overlay android:targetPackage="android"
+                   android:isStatic="true"
+                   android:priority="100"/>
 </manifest>
diff --git a/overlay/FrameworksResCommon/res/values-ar-rXB-feminine/config.xml b/overlay/FrameworksResCommon/res/values-ar-rXB-feminine/config.xml
new file mode 100644
index 0000000..5315088
--- /dev/null
+++ b/overlay/FrameworksResCommon/res/values-ar-rXB-feminine/config.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- ComponentName of a dream to show whenever the system would otherwise have
+         gone to sleep.  When the PowerManager is asked to go to sleep, it will instead
+         try to start this dream if possible.  The dream should typically call startDozing()
+         to put the display into a low power state and allow the application processor
+         to be suspended.  When the dream ends, the system will go to sleep as usual.
+         Specify the component name or an empty string if none.
+
+         Note that doze dreams are not subject to the same start conditions as ordinary dreams.
+         Doze dreams will run whenever the power manager is in a dozing state. -->
+    <string name="config_dozeComponent" translatable="false">(F)‏‮com.android.systemui/com.android.systemui.doze.DozeService‬‏</string>
+</resources>
diff --git a/overlay/FrameworksResCommon/res/values-ar-rXB-masculine/config.xml b/overlay/FrameworksResCommon/res/values-ar-rXB-masculine/config.xml
new file mode 100644
index 0000000..1be25cd
--- /dev/null
+++ b/overlay/FrameworksResCommon/res/values-ar-rXB-masculine/config.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- ComponentName of a dream to show whenever the system would otherwise have
+         gone to sleep.  When the PowerManager is asked to go to sleep, it will instead
+         try to start this dream if possible.  The dream should typically call startDozing()
+         to put the display into a low power state and allow the application processor
+         to be suspended.  When the dream ends, the system will go to sleep as usual.
+         Specify the component name or an empty string if none.
+
+         Note that doze dreams are not subject to the same start conditions as ordinary dreams.
+         Doze dreams will run whenever the power manager is in a dozing state. -->
+    <string name="config_dozeComponent" translatable="false">(M)‏‮com.android.systemui/com.android.systemui.doze.DozeService‬‏</string>
+</resources>
diff --git a/overlay/FrameworksResCommon/res/values-ar-rXB-neuter/config.xml b/overlay/FrameworksResCommon/res/values-ar-rXB-neuter/config.xml
new file mode 100644
index 0000000..62337ff
--- /dev/null
+++ b/overlay/FrameworksResCommon/res/values-ar-rXB-neuter/config.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- ComponentName of a dream to show whenever the system would otherwise have
+         gone to sleep.  When the PowerManager is asked to go to sleep, it will instead
+         try to start this dream if possible.  The dream should typically call startDozing()
+         to put the display into a low power state and allow the application processor
+         to be suspended.  When the dream ends, the system will go to sleep as usual.
+         Specify the component name or an empty string if none.
+
+         Note that doze dreams are not subject to the same start conditions as ordinary dreams.
+         Doze dreams will run whenever the power manager is in a dozing state. -->
+    <string name="config_dozeComponent" translatable="false">(N)‏‮com.android.systemui/com.android.systemui.doze.DozeService‬‏</string>
+</resources>
diff --git a/overlay/FrameworksResCommon/res/values-ar-rXB/config.xml b/overlay/FrameworksResCommon/res/values-ar-rXB/config.xml
new file mode 100644
index 0000000..7fc7fe3
--- /dev/null
+++ b/overlay/FrameworksResCommon/res/values-ar-rXB/config.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- ComponentName of a dream to show whenever the system would otherwise have
+         gone to sleep.  When the PowerManager is asked to go to sleep, it will instead
+         try to start this dream if possible.  The dream should typically call startDozing()
+         to put the display into a low power state and allow the application processor
+         to be suspended.  When the dream ends, the system will go to sleep as usual.
+         Specify the component name or an empty string if none.
+
+         Note that doze dreams are not subject to the same start conditions as ordinary dreams.
+         Doze dreams will run whenever the power manager is in a dozing state. -->
+    <string name="config_dozeComponent" translatable="false">‏‮com.android.systemui/com.android.systemui.doze.DozeService‬‏</string>
+</resources>
diff --git a/overlay/FrameworksResCommon/res/values-en-rXA-feminine/config.xml b/overlay/FrameworksResCommon/res/values-en-rXA-feminine/config.xml
new file mode 100644
index 0000000..e3beefe
--- /dev/null
+++ b/overlay/FrameworksResCommon/res/values-en-rXA-feminine/config.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- ComponentName of a dream to show whenever the system would otherwise have
+         gone to sleep.  When the PowerManager is asked to go to sleep, it will instead
+         try to start this dream if possible.  The dream should typically call startDozing()
+         to put the display into a low power state and allow the application processor
+         to be suspended.  When the dream ends, the system will go to sleep as usual.
+         Specify the component name or an empty string if none.
+
+         Note that doze dreams are not subject to the same start conditions as ordinary dreams.
+         Doze dreams will run whenever the power manager is in a dozing state. -->
+    <string name="config_dozeComponent" translatable="false">(F)[çöḿ.åñðŕöîð.šýšţéḿûî/çöḿ.åñðŕöîð.šýšţéḿûî.ðöžé.ÐöžéŠéŕVîçé one two three four five six seven]</string>
+</resources>
diff --git a/overlay/FrameworksResCommon/res/values-en-rXA-masculine/config.xml b/overlay/FrameworksResCommon/res/values-en-rXA-masculine/config.xml
new file mode 100644
index 0000000..4855dc5
--- /dev/null
+++ b/overlay/FrameworksResCommon/res/values-en-rXA-masculine/config.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- ComponentName of a dream to show whenever the system would otherwise have
+         gone to sleep.  When the PowerManager is asked to go to sleep, it will instead
+         try to start this dream if possible.  The dream should typically call startDozing()
+         to put the display into a low power state and allow the application processor
+         to be suspended.  When the dream ends, the system will go to sleep as usual.
+         Specify the component name or an empty string if none.
+
+         Note that doze dreams are not subject to the same start conditions as ordinary dreams.
+         Doze dreams will run whenever the power manager is in a dozing state. -->
+    <string name="config_dozeComponent" translatable="false">(M)[çöḿ.åñðŕöîð.šýšţéḿûî/çöḿ.åñðŕöîð.šýšţéḿûî.ðöžé.ÐöžéŠéŕVîçé one two three four five six seven]</string>
+</resources>
diff --git a/overlay/FrameworksResCommon/res/values-en-rXA-neuter/config.xml b/overlay/FrameworksResCommon/res/values-en-rXA-neuter/config.xml
new file mode 100644
index 0000000..d01e983
--- /dev/null
+++ b/overlay/FrameworksResCommon/res/values-en-rXA-neuter/config.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- ComponentName of a dream to show whenever the system would otherwise have
+         gone to sleep.  When the PowerManager is asked to go to sleep, it will instead
+         try to start this dream if possible.  The dream should typically call startDozing()
+         to put the display into a low power state and allow the application processor
+         to be suspended.  When the dream ends, the system will go to sleep as usual.
+         Specify the component name or an empty string if none.
+
+         Note that doze dreams are not subject to the same start conditions as ordinary dreams.
+         Doze dreams will run whenever the power manager is in a dozing state. -->
+    <string name="config_dozeComponent" translatable="false">(N)[çöḿ.åñðŕöîð.šýšţéḿûî/çöḿ.åñðŕöîð.šýšţéḿûî.ðöžé.ÐöžéŠéŕVîçé one two three four five six seven]</string>
+</resources>
diff --git a/overlay/FrameworksResCommon/res/values-en-rXA/config.xml b/overlay/FrameworksResCommon/res/values-en-rXA/config.xml
new file mode 100644
index 0000000..9831b0a
--- /dev/null
+++ b/overlay/FrameworksResCommon/res/values-en-rXA/config.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- ComponentName of a dream to show whenever the system would otherwise have
+         gone to sleep.  When the PowerManager is asked to go to sleep, it will instead
+         try to start this dream if possible.  The dream should typically call startDozing()
+         to put the display into a low power state and allow the application processor
+         to be suspended.  When the dream ends, the system will go to sleep as usual.
+         Specify the component name or an empty string if none.
+
+         Note that doze dreams are not subject to the same start conditions as ordinary dreams.
+         Doze dreams will run whenever the power manager is in a dozing state. -->
+    <string name="config_dozeComponent" translatable="false">[çöḿ.åñðŕöîð.šýšţéḿûî/çöḿ.åñðŕöîð.šýšţéḿûî.ðöžé.ÐöžéŠéŕVîçé one two three four five six seven]</string>
+</resources>
diff --git a/overlay/FrameworksResCommon/res/values-mcc234-mnc15-en-rGB/config.xml b/overlay/FrameworksResCommon/res/values-mcc234-mnc15-en-rGB/config.xml
new file mode 100644
index 0000000..98a7e6e
--- /dev/null
+++ b/overlay/FrameworksResCommon/res/values-mcc234-mnc15-en-rGB/config.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- National language single shift tables to enable for SMS encoding.
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 to conform with
+           By-Law Number 27230. (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
+         Example 2: devices sold in India should include tables 4 through 13
+           to enable use of the new Release 9 tables for Indic languages. -->
+    <integer-array name="config_sms_enabled_single_shift_tables">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+    </integer-array>
+
+    <!-- National language locking shift tables to enable for SMS encoding.
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 after the
+           Turkish Telecommunication Authority requires locking shift encoding
+           to be enabled (est. July 2012). (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
+           See also: http://www.mobitech.com.tr/tr/ersanozturkblog_en/index.php?entry=entry090223-160014
+         Example 2: devices sold in India should include tables 4 through 13
+         to enable use of the new Release 9 tables for Indic languages. -->
+    <integer-array name="config_sms_enabled_locking_shift_tables">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+    </integer-array>
+</resources>
diff --git a/overlay/FrameworksResCommon/res/values-mcc234-mnc15-en-rIN/config.xml b/overlay/FrameworksResCommon/res/values-mcc234-mnc15-en-rIN/config.xml
new file mode 100644
index 0000000..98a7e6e
--- /dev/null
+++ b/overlay/FrameworksResCommon/res/values-mcc234-mnc15-en-rIN/config.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- National language single shift tables to enable for SMS encoding.
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 to conform with
+           By-Law Number 27230. (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
+         Example 2: devices sold in India should include tables 4 through 13
+           to enable use of the new Release 9 tables for Indic languages. -->
+    <integer-array name="config_sms_enabled_single_shift_tables">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+    </integer-array>
+
+    <!-- National language locking shift tables to enable for SMS encoding.
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 after the
+           Turkish Telecommunication Authority requires locking shift encoding
+           to be enabled (est. July 2012). (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
+           See also: http://www.mobitech.com.tr/tr/ersanozturkblog_en/index.php?entry=entry090223-160014
+         Example 2: devices sold in India should include tables 4 through 13
+         to enable use of the new Release 9 tables for Indic languages. -->
+    <integer-array name="config_sms_enabled_locking_shift_tables">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+    </integer-array>
+</resources>
diff --git a/overlay/FrameworksResCommon/res/values-mcc234-mnc15/config.xml b/overlay/FrameworksResCommon/res/values-mcc234-mnc15/config.xml
index a336d06..98a7e6e 100644
--- a/overlay/FrameworksResCommon/res/values-mcc234-mnc15/config.xml
+++ b/overlay/FrameworksResCommon/res/values-mcc234-mnc15/config.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2023 The LineageOS Project
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
     <!-- National language single shift tables to enable for SMS encoding.
          Decoding is always enabled. 3GPP TS 23.038 states that this feature
          should not be enabled until a formal request is issued by the relevant
@@ -54,5 +53,4 @@
         <item>12</item>
         <item>13</item>
     </integer-array>
-
 </resources>
diff --git a/overlay/FrameworksResCommon/res/values-mcc262-mnc2-en-rGB/config.xml b/overlay/FrameworksResCommon/res/values-mcc262-mnc2-en-rGB/config.xml
new file mode 100644
index 0000000..98a7e6e
--- /dev/null
+++ b/overlay/FrameworksResCommon/res/values-mcc262-mnc2-en-rGB/config.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- National language single shift tables to enable for SMS encoding.
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 to conform with
+           By-Law Number 27230. (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
+         Example 2: devices sold in India should include tables 4 through 13
+           to enable use of the new Release 9 tables for Indic languages. -->
+    <integer-array name="config_sms_enabled_single_shift_tables">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+    </integer-array>
+
+    <!-- National language locking shift tables to enable for SMS encoding.
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 after the
+           Turkish Telecommunication Authority requires locking shift encoding
+           to be enabled (est. July 2012). (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
+           See also: http://www.mobitech.com.tr/tr/ersanozturkblog_en/index.php?entry=entry090223-160014
+         Example 2: devices sold in India should include tables 4 through 13
+         to enable use of the new Release 9 tables for Indic languages. -->
+    <integer-array name="config_sms_enabled_locking_shift_tables">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+    </integer-array>
+</resources>
diff --git a/overlay/FrameworksResCommon/res/values-mcc262-mnc2-en-rIN/config.xml b/overlay/FrameworksResCommon/res/values-mcc262-mnc2-en-rIN/config.xml
new file mode 100644
index 0000000..98a7e6e
--- /dev/null
+++ b/overlay/FrameworksResCommon/res/values-mcc262-mnc2-en-rIN/config.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- National language single shift tables to enable for SMS encoding.
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 to conform with
+           By-Law Number 27230. (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
+         Example 2: devices sold in India should include tables 4 through 13
+           to enable use of the new Release 9 tables for Indic languages. -->
+    <integer-array name="config_sms_enabled_single_shift_tables">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+    </integer-array>
+
+    <!-- National language locking shift tables to enable for SMS encoding.
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 after the
+           Turkish Telecommunication Authority requires locking shift encoding
+           to be enabled (est. July 2012). (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
+           See also: http://www.mobitech.com.tr/tr/ersanozturkblog_en/index.php?entry=entry090223-160014
+         Example 2: devices sold in India should include tables 4 through 13
+         to enable use of the new Release 9 tables for Indic languages. -->
+    <integer-array name="config_sms_enabled_locking_shift_tables">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+    </integer-array>
+</resources>
diff --git a/overlay/FrameworksResCommon/res/values-mcc262-mnc2/config.xml b/overlay/FrameworksResCommon/res/values-mcc262-mnc2/config.xml
index a336d06..98a7e6e 100644
--- a/overlay/FrameworksResCommon/res/values-mcc262-mnc2/config.xml
+++ b/overlay/FrameworksResCommon/res/values-mcc262-mnc2/config.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2023 The LineageOS Project
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
     <!-- National language single shift tables to enable for SMS encoding.
          Decoding is always enabled. 3GPP TS 23.038 states that this feature
          should not be enabled until a formal request is issued by the relevant
@@ -54,5 +53,4 @@
         <item>12</item>
         <item>13</item>
     </integer-array>
-
 </resources>
diff --git a/overlay/FrameworksResCommon/res/values-mcc262-mnc4-en-rGB/config.xml b/overlay/FrameworksResCommon/res/values-mcc262-mnc4-en-rGB/config.xml
new file mode 100644
index 0000000..98a7e6e
--- /dev/null
+++ b/overlay/FrameworksResCommon/res/values-mcc262-mnc4-en-rGB/config.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- National language single shift tables to enable for SMS encoding.
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 to conform with
+           By-Law Number 27230. (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
+         Example 2: devices sold in India should include tables 4 through 13
+           to enable use of the new Release 9 tables for Indic languages. -->
+    <integer-array name="config_sms_enabled_single_shift_tables">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+    </integer-array>
+
+    <!-- National language locking shift tables to enable for SMS encoding.
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 after the
+           Turkish Telecommunication Authority requires locking shift encoding
+           to be enabled (est. July 2012). (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
+           See also: http://www.mobitech.com.tr/tr/ersanozturkblog_en/index.php?entry=entry090223-160014
+         Example 2: devices sold in India should include tables 4 through 13
+         to enable use of the new Release 9 tables for Indic languages. -->
+    <integer-array name="config_sms_enabled_locking_shift_tables">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+    </integer-array>
+</resources>
diff --git a/overlay/FrameworksResCommon/res/values-mcc262-mnc4-en-rIN/config.xml b/overlay/FrameworksResCommon/res/values-mcc262-mnc4-en-rIN/config.xml
new file mode 100644
index 0000000..98a7e6e
--- /dev/null
+++ b/overlay/FrameworksResCommon/res/values-mcc262-mnc4-en-rIN/config.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- National language single shift tables to enable for SMS encoding.
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 to conform with
+           By-Law Number 27230. (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
+         Example 2: devices sold in India should include tables 4 through 13
+           to enable use of the new Release 9 tables for Indic languages. -->
+    <integer-array name="config_sms_enabled_single_shift_tables">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+    </integer-array>
+
+    <!-- National language locking shift tables to enable for SMS encoding.
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 after the
+           Turkish Telecommunication Authority requires locking shift encoding
+           to be enabled (est. July 2012). (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
+           See also: http://www.mobitech.com.tr/tr/ersanozturkblog_en/index.php?entry=entry090223-160014
+         Example 2: devices sold in India should include tables 4 through 13
+         to enable use of the new Release 9 tables for Indic languages. -->
+    <integer-array name="config_sms_enabled_locking_shift_tables">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+    </integer-array>
+</resources>
diff --git a/overlay/FrameworksResCommon/res/values-mcc262-mnc4/config.xml b/overlay/FrameworksResCommon/res/values-mcc262-mnc4/config.xml
index a336d06..98a7e6e 100644
--- a/overlay/FrameworksResCommon/res/values-mcc262-mnc4/config.xml
+++ b/overlay/FrameworksResCommon/res/values-mcc262-mnc4/config.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2023 The LineageOS Project
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
     <!-- National language single shift tables to enable for SMS encoding.
          Decoding is always enabled. 3GPP TS 23.038 states that this feature
          should not be enabled until a formal request is issued by the relevant
@@ -54,5 +53,4 @@
         <item>12</item>
         <item>13</item>
     </integer-array>
-
 </resources>
diff --git a/overlay/FrameworksResCommon/res/values-mcc262-mnc9-en-rGB/config.xml b/overlay/FrameworksResCommon/res/values-mcc262-mnc9-en-rGB/config.xml
new file mode 100644
index 0000000..98a7e6e
--- /dev/null
+++ b/overlay/FrameworksResCommon/res/values-mcc262-mnc9-en-rGB/config.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- National language single shift tables to enable for SMS encoding.
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 to conform with
+           By-Law Number 27230. (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
+         Example 2: devices sold in India should include tables 4 through 13
+           to enable use of the new Release 9 tables for Indic languages. -->
+    <integer-array name="config_sms_enabled_single_shift_tables">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+    </integer-array>
+
+    <!-- National language locking shift tables to enable for SMS encoding.
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 after the
+           Turkish Telecommunication Authority requires locking shift encoding
+           to be enabled (est. July 2012). (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
+           See also: http://www.mobitech.com.tr/tr/ersanozturkblog_en/index.php?entry=entry090223-160014
+         Example 2: devices sold in India should include tables 4 through 13
+         to enable use of the new Release 9 tables for Indic languages. -->
+    <integer-array name="config_sms_enabled_locking_shift_tables">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+    </integer-array>
+</resources>
diff --git a/overlay/FrameworksResCommon/res/values-mcc262-mnc9-en-rIN/config.xml b/overlay/FrameworksResCommon/res/values-mcc262-mnc9-en-rIN/config.xml
new file mode 100644
index 0000000..98a7e6e
--- /dev/null
+++ b/overlay/FrameworksResCommon/res/values-mcc262-mnc9-en-rIN/config.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- National language single shift tables to enable for SMS encoding.
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 to conform with
+           By-Law Number 27230. (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
+         Example 2: devices sold in India should include tables 4 through 13
+           to enable use of the new Release 9 tables for Indic languages. -->
+    <integer-array name="config_sms_enabled_single_shift_tables">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+    </integer-array>
+
+    <!-- National language locking shift tables to enable for SMS encoding.
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 after the
+           Turkish Telecommunication Authority requires locking shift encoding
+           to be enabled (est. July 2012). (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
+           See also: http://www.mobitech.com.tr/tr/ersanozturkblog_en/index.php?entry=entry090223-160014
+         Example 2: devices sold in India should include tables 4 through 13
+         to enable use of the new Release 9 tables for Indic languages. -->
+    <integer-array name="config_sms_enabled_locking_shift_tables">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+    </integer-array>
+</resources>
diff --git a/overlay/FrameworksResCommon/res/values-mcc262-mnc9/config.xml b/overlay/FrameworksResCommon/res/values-mcc262-mnc9/config.xml
index a336d06..98a7e6e 100644
--- a/overlay/FrameworksResCommon/res/values-mcc262-mnc9/config.xml
+++ b/overlay/FrameworksResCommon/res/values-mcc262-mnc9/config.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2023 The LineageOS Project
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
     <!-- National language single shift tables to enable for SMS encoding.
          Decoding is always enabled. 3GPP TS 23.038 states that this feature
          should not be enabled until a formal request is issued by the relevant
@@ -54,5 +53,4 @@
         <item>12</item>
         <item>13</item>
     </integer-array>
-
 </resources>
diff --git a/overlay/FrameworksResCommon/res/values-mcc310-mnc120/config.xml b/overlay/FrameworksResCommon/res/values-mcc310-mnc120/config.xml
index 47eb29f..22187a5 100644
--- a/overlay/FrameworksResCommon/res/values-mcc310-mnc120/config.xml
+++ b/overlay/FrameworksResCommon/res/values-mcc310-mnc120/config.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2023 The LineageOS Project
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
     <!-- If Voice Radio Technology is RIL_RADIO_TECHNOLOGY_LTE:14 or
          RIL_RADIO_TECHNOLOGY_UNKNOWN:0 this is the value that should be used instead.
          A configuration value of RIL_RADIO_TECHNOLOGY_UNKNOWN:0 means
          there is no replacement value and that the default assumption
          for phone type (GSM) should be used. -->
     <integer name="config_volte_replacement_rat">6</integer>
-
 </resources>
diff --git a/overlay/FrameworksResCommon/res/values-mcc310-mnc260/config.xml b/overlay/FrameworksResCommon/res/values-mcc310-mnc260/config.xml
index c5baae5..7af29a7 100644
--- a/overlay/FrameworksResCommon/res/values-mcc310-mnc260/config.xml
+++ b/overlay/FrameworksResCommon/res/values-mcc310-mnc260/config.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2023 The LineageOS Project
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
     <!-- If Voice Radio Technology is RIL_RADIO_TECHNOLOGY_LTE:14 or
          RIL_RADIO_TECHNOLOGY_UNKNOWN:0 this is the value that should be used instead.
          A configuration value of RIL_RADIO_TECHNOLOGY_UNKNOWN:0 means
          there is no replacement value and that the default assumption
          for phone type (GSM) should be used. -->
     <integer name="config_volte_replacement_rat">3</integer>
-
 </resources>
diff --git a/overlay/FrameworksResCommon/res/values-mcc310-mnc4/config.xml b/overlay/FrameworksResCommon/res/values-mcc310-mnc4/config.xml
index 47eb29f..22187a5 100644
--- a/overlay/FrameworksResCommon/res/values-mcc310-mnc4/config.xml
+++ b/overlay/FrameworksResCommon/res/values-mcc310-mnc4/config.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2023 The LineageOS Project
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
     <!-- If Voice Radio Technology is RIL_RADIO_TECHNOLOGY_LTE:14 or
          RIL_RADIO_TECHNOLOGY_UNKNOWN:0 this is the value that should be used instead.
          A configuration value of RIL_RADIO_TECHNOLOGY_UNKNOWN:0 means
          there is no replacement value and that the default assumption
          for phone type (GSM) should be used. -->
     <integer name="config_volte_replacement_rat">6</integer>
-
 </resources>
diff --git a/overlay/FrameworksResCommon/res/values-mcc310-mnc410/config.xml b/overlay/FrameworksResCommon/res/values-mcc310-mnc410/config.xml
index c5baae5..7af29a7 100644
--- a/overlay/FrameworksResCommon/res/values-mcc310-mnc410/config.xml
+++ b/overlay/FrameworksResCommon/res/values-mcc310-mnc410/config.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2023 The LineageOS Project
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
     <!-- If Voice Radio Technology is RIL_RADIO_TECHNOLOGY_LTE:14 or
          RIL_RADIO_TECHNOLOGY_UNKNOWN:0 this is the value that should be used instead.
          A configuration value of RIL_RADIO_TECHNOLOGY_UNKNOWN:0 means
          there is no replacement value and that the default assumption
          for phone type (GSM) should be used. -->
     <integer name="config_volte_replacement_rat">3</integer>
-
 </resources>
diff --git a/overlay/FrameworksResCommon/res/values-mcc311-mnc480/config.xml b/overlay/FrameworksResCommon/res/values-mcc311-mnc480/config.xml
index e7dd1f2..24384a8 100644
--- a/overlay/FrameworksResCommon/res/values-mcc311-mnc480/config.xml
+++ b/overlay/FrameworksResCommon/res/values-mcc311-mnc480/config.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2023 The LineageOS Project
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
     <!-- If Voice Radio Technology is RIL_RADIO_TECHNOLOGY_LTE:14 or
          RIL_RADIO_TECHNOLOGY_UNKNOWN:0 this is the value that should be used instead.
          A configuration value of RIL_RADIO_TECHNOLOGY_UNKNOWN:0 means
@@ -16,5 +15,4 @@
          carrier provisioning. If false: hard disabled. If true: then depends on carrier
          provisioning, availability etc -->
     <bool name="config_carrier_volte_available">true</bool>
-
 </resources>
diff --git a/overlay/FrameworksResCommon/res/values-mcc460-mnc11/config.xml b/overlay/FrameworksResCommon/res/values-mcc460-mnc11/config.xml
deleted file mode 100644
index c47f539..0000000
--- a/overlay/FrameworksResCommon/res/values-mcc460-mnc11/config.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2024 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- If Voice Radio Technology is RIL_RADIO_TECHNOLOGY_LTE:14 or
-         RIL_RADIO_TECHNOLOGY_UNKNOWN:0 this is the value that should be used instead.
-         A configuration value of RIL_RADIO_TECHNOLOGY_UNKNOWN:0 means
-         there is no replacement value and that the default assumption
-         for phone type (GSM) should be used. -->
-    <integer name="config_volte_replacement_rat">6</integer>
-
-</resources>
diff --git a/overlay/FrameworksResCommon/res/values-mcc460-mnc3/config.xml b/overlay/FrameworksResCommon/res/values-mcc460-mnc3/config.xml
deleted file mode 100644
index c47f539..0000000
--- a/overlay/FrameworksResCommon/res/values-mcc460-mnc3/config.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2024 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- If Voice Radio Technology is RIL_RADIO_TECHNOLOGY_LTE:14 or
-         RIL_RADIO_TECHNOLOGY_UNKNOWN:0 this is the value that should be used instead.
-         A configuration value of RIL_RADIO_TECHNOLOGY_UNKNOWN:0 means
-         there is no replacement value and that the default assumption
-         for phone type (GSM) should be used. -->
-    <integer name="config_volte_replacement_rat">6</integer>
-
-</resources>
diff --git a/overlay/FrameworksResCommon/res/values/config.xml b/overlay/FrameworksResCommon/res/values/config.xml
index 8710dfe..ab0e8c2 100644
--- a/overlay/FrameworksResCommon/res/values/config.xml
+++ b/overlay/FrameworksResCommon/res/values/config.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2023 The LineageOS Project
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
     <!-- NOTE: The telephony module is no longer reading the configuration below for available
          APN types.  The set of APN types and relevant settings are specified within the telephony
          module and are non-configurable.  Whether or not data connectivity over a cellular network
@@ -159,9 +158,6 @@
         <item>255</item>
     </integer-array>
 
-    <!-- The name of the package that will hold the SMS role by default. -->
-    <string name="config_defaultSms" translatable="false">com.android.mms</string>
-
     <!-- The restoring is handled by modem if it is true-->
     <bool name="skip_restoring_network_selection" translatable="false">true</bool>
 
@@ -186,31 +182,14 @@
          Doze dreams will run whenever the power manager is in a dozing state. -->
     <string name="config_dozeComponent" translatable="false">com.android.systemui/com.android.systemui.doze.DozeService</string>
 
-    <!-- If true, the doze component is not started until after the screen has been
-         turned off and the screen off animation has been performed. -->
-    <bool name="config_dozeAfterScreenOffByDefault">true</bool>
+    <!-- Control whether the always on display mode is available. This should only be enabled on
+         devices where the display has been tuned to be power efficient in DOZE and/or DOZE_SUSPEND
+         states. -->
+    <bool name="config_dozeAlwaysOnDisplayAvailable">true</bool>
 
-    <!-- Power Management: Specifies whether to decouple the interactive state of the
-         device from the display on/off state.
-
-         When false, setInteractive(..., true) will be called before the display is turned on
-         and setInteractive(..., false) will be called after the display is turned off.
-         This mode provides best compatibility for devices that expect the interactive
-         state to be tied to the display state.
-
-         When true, setInteractive(...) will be called independently of whether the display
-         is being turned on or off.  This mode enables the power manager to reduce
-         clocks and disable the touch controller while the display is on.
-
-         This resource should be set to "true" when a doze component has been specified
-         to maximize power savings but not all devices support it.
-
-         Refer to power.h for details.
-    -->
-    <bool name="config_powerDecoupleInteractiveModeFromDisplay">false</bool>
-
-    <!-- Set to true to add links to Cell Broadcast app from Settings and MMS app. -->
-    <bool name="config_cellBroadcastAppLinks">true</bool>
+    <!-- Control whether the always on display mode is enabled by default. This value will be used
+         during initialization when the setting is still null. -->
+    <bool name="config_dozeAlwaysOnEnabled">false</bool>
 
     <!--  Maximum number of supported users -->
     <integer name="config_multiuserMaximumUsers">4</integer>
@@ -228,7 +207,7 @@
     <string-array name="config_mobile_tcp_buffers">
         <item>5gnr:2097152,6291456,16777216,512000,2097152,8388608</item>
         <item>lte:2097152,4194304,8388608,262144,524288,1048576</item>
-        <item>lte_ca:4096,6291456,12582912,4096,1048576,2097152</item>
+        <item>lte_ca:4096,6291456,12582912,4096,1048576,4194304</item>
         <item>umts:4094,87380,1220608,4096,16384,1220608</item>
         <item>hspa:4094,87380,1220608,4096,16384,1220608</item>
         <item>hsupa:4094,87380,1220608,4096,16384,1220608</item>
@@ -239,31 +218,6 @@
         <item>evdo:4094,87380,524288,4096,16384,262144</item>
     </string-array>
 
-    <!-- Configure tcp buffer sizes per network type in the form:
-         network-type:rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max
-
-         The network-type must be a valid DataConfigNetworkType value. If no value is found for the
-         network-type in use, config_tcp_buffers will be used instead.
-    -->
-    <string-array name="config_network_type_tcp_buffers">
-        <item>NR_SA_MMWAVE:2097152,6291456,16777216,512000,2097152,8388608</item>
-        <item>NR_SA:2097152,6291456,16777216,512000,2097152,8388608</item>
-        <item>NR_NSA_MMWAVE:2097152,6291456,16777216,512000,2097152,8388608</item>
-        <item>NR_NSA:2097152,6291456,16777216,512000,2097152,8388608</item>
-        <item>LTE:2097152,4194304,8388608,262144,524288,1048576</item>
-        <item>LTE_CA:4096,6291456,12582912,4096,1048576,2097152</item>
-        <item>UMTS:4094,87380,1220608,4096,16384,1220608</item>
-        <item>HSPA:4094,87380,1220608,4096,16384,1220608</item>
-        <item>HSUPA:4094,87380,1220608,4096,16384,1220608</item>
-        <item>HSDPA:4094,87380,1220608,4096,16384,1220608</item>
-        <item>HSPA+:4094,87380,1220608,4096,16384,1220608</item>
-        <item>EDGE:4093,26280,35040,4096,16384,35040</item>
-        <item>GPRS:4092,8760,11680,4096,8760,11680</item>
-        <item>EvDo_0:4094,87380,524288,4096,16384,262144</item>
-        <item>EvDo_A:4094,87380,524288,4096,16384,262144</item>
-        <item>EvDo_B:4094,87380,524288,4096,16384,262144</item>
-    </string-array>
-
     <!-- Set to true if the wifi display supports compositing content stored
          in gralloc protected buffers.  For this to be true, there must exist
          a protected hardware path for surface flinger to composite and send
@@ -278,9 +232,6 @@
     -->
     <bool name="config_wifiDisplaySupportsProtectedBuffers">true</bool>
 
-    <!-- Whether camera shutter sound is forced or not  (country specific). -->
-    <bool name="config_camera_sound_forced">false</bool>
-
     <!-- Flag indicating if the speed up audio on mt call code should be executed -->
     <bool name="config_speed_up_audio_on_mt_calls">true</bool>
 
@@ -291,6 +242,9 @@
     <!-- Flag indicating which package name can access the persistent data partition -->
     <string name="config_persistentDataPackageName" translatable="false">com.google.android.gms</string>
 
+    <!--  Define optional package verifier name -->
+    <string name="config_optionalPackageVerifierName" translatable="false">seemp.service</string>
+
     <!-- Flag specifying whether VoLTE is available on device -->
     <bool name="config_device_volte_available">true</bool>
 
@@ -305,10 +259,6 @@
     <!-- Flag specifying whether WFC over IMS is available on device -->
     <bool name="config_device_wfc_ims_available">true</bool>
 
-    <!-- Support decoding the user data payload as pack GSM 8-bit (a GSM alphabet
-        string that's stored in 8-bit unpacked format) characters.-->
-    <bool name="config_sms_decode_gsm_8bit_data" translatable="false">true</bool>
-
     <!-- Config determines whether to update phone object when voice registration
          state changes. Voice radio tech change will always trigger an update of
          phone object irrespective of this config -->
@@ -349,28 +299,4 @@
 
     <!-- Whether to select voice/data/sms preference without user confirmation -->
     <bool name="config_voice_data_sms_auto_fallback">true</bool>
-
-    <!-- Whether to adopt the predefined handover policies for IWLAN.
-         {@see CarrierConfigManager#KEY_IWLAN_HANDOVER_POLICY_STRING_ARRAY}
-    -->
-    <bool name="config_enable_iwlan_handover_policy">false</bool>
-
-    <!-- IWLAN data service package name to bind to by default. If none is specified in an overlay,
-         an empty string is passed in -->
-    <string name="config_wlan_data_service_package" translatable="false">vendor.qti.iwlan</string>
-
-    <!-- IWLAN network service package name to bind to by default. If none is specified in an
-         overlay, an empty string is passed in -->
-    <string name="config_wlan_network_service_package" translatable="false">vendor.qti.iwlan</string>
-
-    <!-- Telephony qualified networks service package name to bind to by default. -->
-    <string name="config_qualified_networks_service_package" translatable="false">vendor.qti.iwlan</string>
-
-    <!-- Whether enhanced IWLAN handover check is enabled. If enabled, telephony frameworks
-         will not perform handover if the target transport is out of service, or VoPS not
-         supported. The network will be torn down on the source transport, and will be
-         re-established on the target transport when condition is allowed for bringing up a
-         new network. -->
-    <bool name="config_enhanced_iwlan_handover_check">false</bool>
-
 </resources>
diff --git a/overlay/FrameworksResCommon/res/values/config_telephony.xml b/overlay/FrameworksResCommon/res/values/config_telephony.xml
new file mode 100644
index 0000000..ebdf07e
--- /dev/null
+++ b/overlay/FrameworksResCommon/res/values/config_telephony.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Configure tcp buffer sizes per network type in the form:
+         network-type:rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max
+
+         The network-type must be a valid DataConfigNetworkType value. If no value is found for the
+         network-type in use, config_tcp_buffers will be used instead.
+    -->
+    <string-array name="config_network_type_tcp_buffers">
+        <item>NR_SA_MMWAVE:2097152,6291456,16777216,512000,2097152,8388608</item>
+        <item>NR_SA:2097152,6291456,16777216,512000,2097152,8388608</item>
+        <item>NR_NSA_MMWAVE:2097152,6291456,16777216,512000,2097152,8388608</item>
+        <item>NR_NSA:2097152,6291456,16777216,512000,2097152,8388608</item>
+        <item>LTE:2097152,4194304,8388608,262144,524288,1048576</item>
+        <item>LTE_CA:4096,6291456,12582912,4096,1048576,4194304</item>
+        <item>UMTS:4094,87380,1220608,4096,16384,1220608</item>
+        <item>HSPA:4094,87380,1220608,4096,16384,1220608</item>
+        <item>HSUPA:4094,87380,1220608,4096,16384,1220608</item>
+        <item>HSDPA:4094,87380,1220608,4096,16384,1220608</item>
+        <item>HSPA+:4094,87380,1220608,4096,16384,1220608</item>
+        <item>EDGE:4093,26280,35040,4096,16384,35040</item>
+        <item>GPRS:4092,8760,11680,4096,8760,11680</item>
+        <item>EvDo_0:4094,87380,524288,4096,16384,262144</item>
+        <item>EvDo_A:4094,87380,524288,4096,16384,262144</item>
+        <item>EvDo_B:4094,87380,524288,4096,16384,262144</item>
+    </string-array>
+
+    <!-- Whether to adopt the predefined handover policies for IWLAN.
+         {@see CarrierConfigManager#KEY_IWLAN_HANDOVER_POLICY_STRING_ARRAY}
+    -->
+    <bool name="config_enable_iwlan_handover_policy">false</bool>
+
+    <!-- IWLAN data service package name to bind to by default. If none is specified in an overlay,
+         an empty string is passed in -->
+    <string name="config_wlan_data_service_package" translatable="false">vendor.qti.iwlan</string>
+
+    <!-- IWLAN network service package name to bind to by default. If none is specified in an
+         overlay, an empty string is passed in -->
+    <string name="config_wlan_network_service_package" translatable="false">vendor.qti.iwlan</string>
+
+    <!-- Telephony qualified networks service package name to bind to by default. -->
+    <string name="config_qualified_networks_service_package" translatable="false">vendor.qti.iwlan</string>
+
+    <!-- Telephony satellite service package name to bind to by default. -->
+    <string name="config_satellite_service_package" translatable="false">vendor.qti.data.ntnsatapp</string>
+
+    <!-- Whether enhanced IWLAN handover check is enabled. If enabled, telephony frameworks
+         will not perform handover if the target transport is out of service, or VoPS not
+         supported. The network will be torn down on the source transport, and will be
+         re-established on the target transport when condition is allowed for bringing up a
+         new network. -->
+    <bool name="config_enhanced_iwlan_handover_check">false</bool>
+</resources>
diff --git a/overlay/FrameworksResCommon/res/values/required_apps_managed_device.xml b/overlay/FrameworksResCommon/res/values/required_apps_managed_device.xml
new file mode 100644
index 0000000..8bec5d5
--- /dev/null
+++ b/overlay/FrameworksResCommon/res/values/required_apps_managed_device.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- A list of apps to be retained on the managed device.
+            Takes precedence over the disallowed apps lists. -->
+    <string-array name="required_apps_managed_device" translatable="false">
+        <item>com.android.settings</item>
+        <item>com.android.systemui</item>
+        <item>com.android.contacts</item>
+        <item>org.codeaurora.dialer</item>
+        <item>com.android.stk</item>
+        <item>com.android.providers.downloads</item>
+        <item>com.android.providers.downloads.ui</item>
+        <item>com.android.documentsui</item>
+        <item>com.android.cellbroadcastreceiver</item>
+    </string-array>
+</resources>
diff --git a/overlay/FrameworksResSamsung/Android.bp b/overlay/FrameworksResSamsung/Android.bp
index 41deb1e..c200a6a 100644
--- a/overlay/FrameworksResSamsung/Android.bp
+++ b/overlay/FrameworksResSamsung/Android.bp
@@ -1,6 +1,5 @@
 //
-// Copyright (C) 2024 The LineageOS Project
-//
+// SPDX-FileCopyrightText: 2025 The LineageOS Project
 // SPDX-License-Identifier: Apache-2.0
 //
 
diff --git a/overlay/FrameworksResSamsung/AndroidManifest.xml b/overlay/FrameworksResSamsung/AndroidManifest.xml
index fd90876..da54883 100644
--- a/overlay/FrameworksResSamsung/AndroidManifest.xml
+++ b/overlay/FrameworksResSamsung/AndroidManifest.xml
@@ -1,12 +1,10 @@
 <!--
-     Copyright (C) 2024 The LineageOS Project
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="android.overlay.samsung">
-
-    <overlay
-        android:isStatic="true"
-        android:priority="600"
-        android:targetPackage="android" />
+    <overlay android:targetPackage="android"
+                   android:isStatic="true"
+                   android:priority="600"/>
 </manifest>
diff --git a/overlay/FrameworksResSamsung/res/values/config.xml b/overlay/FrameworksResSamsung/res/values/config.xml
index 1eb404c..5ab935e 100644
--- a/overlay/FrameworksResSamsung/res/values/config.xml
+++ b/overlay/FrameworksResSamsung/res/values/config.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2024 The LineageOS Project
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
     <!-- Whether device supports double tap to wake -->
     <bool name="config_supportDoubleTapWake">true</bool>
 
@@ -42,5 +41,4 @@
 
     <!-- Whether the new Auto Selection Network UI should be shown -->
     <bool name="config_enableNewAutoSelectNetworkUI">true</bool>
-
 </resources>
diff --git a/overlay/FrameworksResTarget/Android.bp b/overlay/FrameworksResTarget/Android.bp
index c5f52f3..6840413 100644
--- a/overlay/FrameworksResTarget/Android.bp
+++ b/overlay/FrameworksResTarget/Android.bp
@@ -1,6 +1,5 @@
 //
-// Copyright (C) 2023 The LineageOS Project
-//
+// SPDX-FileCopyrightText: 2025 The LineageOS Project
 // SPDX-License-Identifier: Apache-2.0
 //
 
diff --git a/overlay/FrameworksResTarget/AndroidManifest.xml b/overlay/FrameworksResTarget/AndroidManifest.xml
index 11d5b26..a6e5109 100644
--- a/overlay/FrameworksResTarget/AndroidManifest.xml
+++ b/overlay/FrameworksResTarget/AndroidManifest.xml
@@ -1,12 +1,10 @@
 <!--
-     Copyright (C) 2023 The LineageOS Project
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="android.overlay.target">
-
-    <overlay
-        android:isStatic="true"
-        android:priority="500"
-        android:targetPackage="android" />
+    <overlay android:targetPackage="android"
+                   android:isStatic="true"
+                   android:priority="500"/>
 </manifest>
diff --git a/overlay/FrameworksResTarget/res/values/config.xml b/overlay/FrameworksResTarget/res/values/config.xml
index 88141a1..baa10f0 100644
--- a/overlay/FrameworksResTarget/res/values/config.xml
+++ b/overlay/FrameworksResTarget/res/values/config.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2023 The LineageOS Project
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
     <!-- Whether a software navigation bar should be shown. NOTE: in the future this may be
          autodetected from the Configuration. -->
     <bool name="config_showNavigationBar">true</bool>
@@ -47,6 +46,9 @@
         <item>/system/framework/framework.jar</item>
         <item>/system/framework/services.jar</item>
         <item>/system/bin/surfaceflinger</item>
+        <item>/system/lib64/libhwui.so</item>
+        <item>/vendor/lib64/libllvm-qgl.so</item>
+        <item>/vendor/lib64/libllvm-glnext.so</item>
     </string-array>
 
     <!-- Whether the device enable the standalone (SA) mode of 5G NR.-->
@@ -54,5 +56,4 @@
 
     <!-- Whether the device enable the non-standalone (NSA) mode of 5G NR.-->
     <bool name="config_telephony5gNonStandalone">true</bool>
-
 </resources>
diff --git a/overlay/SettingsResCommon/Android.bp b/overlay/SettingsResCommon/Android.bp
index b690950..9bbfc19 100644
--- a/overlay/SettingsResCommon/Android.bp
+++ b/overlay/SettingsResCommon/Android.bp
@@ -1,6 +1,5 @@
 //
-// Copyright (C) 2024 The LineageOS Project
-//
+// SPDX-FileCopyrightText: 2025 The LineageOS Project
 // SPDX-License-Identifier: Apache-2.0
 //
 
diff --git a/overlay/SettingsResCommon/AndroidManifest.xml b/overlay/SettingsResCommon/AndroidManifest.xml
index b67f4ee..d6c164e 100644
--- a/overlay/SettingsResCommon/AndroidManifest.xml
+++ b/overlay/SettingsResCommon/AndroidManifest.xml
@@ -1,11 +1,9 @@
 <!--
-     Copyright (C) 2024 The LineageOS Project
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.settings.overlay.common">
-
-    <overlay
-        android:isStatic="true"
-        android:targetPackage="com.android.settings" />
+    <overlay android:targetPackage="com.android.settings"
+                   android:isStatic="true"/>
 </manifest>
diff --git a/overlay/SettingsResCommon/res/values/config.xml b/overlay/SettingsResCommon/res/values/config.xml
index fa78d88..f1d1891 100644
--- a/overlay/SettingsResCommon/res/values/config.xml
+++ b/overlay/SettingsResCommon/res/values/config.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2024 The LineageOS Project
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
     <!-- Display settings screen, Color mode options. Must be the same length and order as
          config_color_mode_options_values below. Only the values that also appear in
          frameworks/base/core/res/res/values/config.xml's config_availableColorModes are shown. -->
@@ -25,5 +24,4 @@
 
     <!-- Max network scan search time in seconds -->
     <integer name="config_network_scan_helper_max_search_time_sec">254</integer>
-
 </resources>
diff --git a/overlay/SettingsResSamsung/Android.bp b/overlay/SettingsResSamsung/Android.bp
index 9df869a..0b5ca9a 100644
--- a/overlay/SettingsResSamsung/Android.bp
+++ b/overlay/SettingsResSamsung/Android.bp
@@ -1,6 +1,5 @@
 //
-// Copyright (C) 2023 The LineageOS Project
-//
+// SPDX-FileCopyrightText: 2025 The LineageOS Project
 // SPDX-License-Identifier: Apache-2.0
 //
 
diff --git a/overlay/SettingsResSamsung/AndroidManifest.xml b/overlay/SettingsResSamsung/AndroidManifest.xml
index 9785eb9..c765a36 100644
--- a/overlay/SettingsResSamsung/AndroidManifest.xml
+++ b/overlay/SettingsResSamsung/AndroidManifest.xml
@@ -1,12 +1,10 @@
 <!--
-     Copyright (C) 2024 The LineageOS Project
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.settings.overlay.samsung">
-
-    <overlay
-        android:isStatic="true"
-        android:priority="600"
-        android:targetPackage="com.android.settings" />
+    <overlay android:targetPackage="com.android.settings"
+                   android:isStatic="true"
+                   android:priority="600"/>
 </manifest>
diff --git a/overlay/SettingsResSamsung/res/values/config.xml b/overlay/SettingsResSamsung/res/values/config.xml
index 0a8b472..627b7b1 100644
--- a/overlay/SettingsResSamsung/res/values/config.xml
+++ b/overlay/SettingsResSamsung/res/values/config.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2024 The LineageOS Project
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
     <!-- The number of vibration intensity levels supported by the device.
 
          Note that this should correspond to the ability to vary the vibration amplitude, with
@@ -26,5 +25,4 @@
 
     <!-- Whether to show Smooth Display feature in Settings Options -->
     <bool name="config_show_smooth_display">true</bool>
-
 </resources>
diff --git a/overlay/SystemUIResCommon/Android.bp b/overlay/SystemUIResCommon/Android.bp
index 4acbf61..d80338a 100644
--- a/overlay/SystemUIResCommon/Android.bp
+++ b/overlay/SystemUIResCommon/Android.bp
@@ -1,6 +1,5 @@
 //
-// Copyright (C) 2023 The LineageOS Project
-//
+// SPDX-FileCopyrightText: 2025 The LineageOS Project
 // SPDX-License-Identifier: Apache-2.0
 //
 
diff --git a/overlay/SystemUIResCommon/AndroidManifest.xml b/overlay/SystemUIResCommon/AndroidManifest.xml
index 9ab2b3d..7b8f928 100644
--- a/overlay/SystemUIResCommon/AndroidManifest.xml
+++ b/overlay/SystemUIResCommon/AndroidManifest.xml
@@ -1,12 +1,9 @@
 <!--
-     Copyright (C) 2023 The LineageOS Project
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.systemui.overlay.common">
-
-    <overlay
-        android:isStatic="true"
-        android:priority="100"
-        android:targetPackage="com.android.systemui" />
+    <overlay android:targetPackage="com.android.systemui"
+                   android:isStatic="true"/>
 </manifest>
diff --git a/overlay/SystemUIResCommon/res/values/config.xml b/overlay/SystemUIResCommon/res/values/config.xml
index 0f8f2e6..f94ba63 100644
--- a/overlay/SystemUIResCommon/res/values/config.xml
+++ b/overlay/SystemUIResCommon/res/values/config.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2023 The LineageOS Project
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
     <!-- Tiles to auto add to Quick Settings upon first change of a given secure setting.
          The syntax is setting-name:spec. If the tile is a TileService, the spec should be specified
          as custom(package/class). Relative class name is supported. -->
@@ -16,5 +15,4 @@
 
     <!-- Doze: does this device support STATE_DOZE?  -->
     <bool name="doze_display_state_supported">true</bool>
-
 </resources>
diff --git a/overlay/TelecommResCommon/Android.bp b/overlay/TelecommResCommon/Android.bp
deleted file mode 100644
index d30f4e6..0000000
--- a/overlay/TelecommResCommon/Android.bp
+++ /dev/null
@@ -1,10 +0,0 @@
-//
-// Copyright (C) 2023 The LineageOS Project
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-
-runtime_resource_overlay {
-    name: "TelecommResCommon",
-    vendor: true,
-}
diff --git a/overlay/TelecommResCommon/AndroidManifest.xml b/overlay/TelecommResCommon/AndroidManifest.xml
deleted file mode 100644
index cad0f44..0000000
--- a/overlay/TelecommResCommon/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<!--
-     Copyright (C) 2023 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.server.telecom.overlay.common">
-
-    <overlay
-        android:isStatic="true"
-        android:priority="100"
-        android:targetPackage="com.android.server.telecom" />
-</manifest>
diff --git a/overlay/TelecommResCommon/res/values/config.xml b/overlay/TelecommResCommon/res/values/config.xml
deleted file mode 100644
index 60ca1f1..0000000
--- a/overlay/TelecommResCommon/res/values/config.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2023 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Class name for the default main Dialer activity [DO NOT TRANSLATE] -->
-    <string name="dialer_default_class" translatable="false">com.android.dialer.DialtactsActivity</string>
-
-    <!-- Class name for the default in-call UI Service [DO NOT TRANSLATE] -->
-    <string name="incall_default_class" translatable="false">com.android.incallui.InCallServiceImpl</string>
-
-    <!-- Flag indicating if the tty is enabled -->
-    <bool name="tty_enabled">true</bool>
-
-</resources>
diff --git a/overlay/TelephonyResCommon/Android.bp b/overlay/TelephonyResCommon/Android.bp
index f74c99e..750d830 100644
--- a/overlay/TelephonyResCommon/Android.bp
+++ b/overlay/TelephonyResCommon/Android.bp
@@ -1,6 +1,5 @@
 //
-// Copyright (C) 2023 The LineageOS Project
-//
+// SPDX-FileCopyrightText: 2025 The LineageOS Project
 // SPDX-License-Identifier: Apache-2.0
 //
 
diff --git a/overlay/TelephonyResCommon/AndroidManifest.xml b/overlay/TelephonyResCommon/AndroidManifest.xml
index 1efb02e..8376605 100644
--- a/overlay/TelephonyResCommon/AndroidManifest.xml
+++ b/overlay/TelephonyResCommon/AndroidManifest.xml
@@ -1,12 +1,9 @@
 <!--
-     Copyright (C) 2023 The LineageOS Project
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.phone.overlay.common">
-
-    <overlay
-        android:isStatic="true"
-        android:priority="100"
-        android:targetPackage="com.android.phone" />
+    <overlay android:targetPackage="com.android.phone"
+                   android:isStatic="true"/>
 </manifest>
diff --git a/overlay/TelephonyResCommon/res/values/config.xml b/overlay/TelephonyResCommon/res/values/config.xml
index 9f9f2ac..3f83b37 100644
--- a/overlay/TelephonyResCommon/res/values/config.xml
+++ b/overlay/TelephonyResCommon/res/values/config.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2023 The LineageOS Project
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
     <!-- Determine whether we should show the "listen for instructions" screen after
          successfully placing the OTA call -->
     <integer name="OtaShowListeningScreen">1</integer>
@@ -32,5 +31,4 @@
 
     <!-- String indicating the package name of the device GbaService implementation. -->
     <string name="config_gba_package" translatable="false">com.qualcomm.qti.uimGbaApp</string>
-
 </resources>
diff --git a/overlay/WifiResCommon/Android.bp b/overlay/WifiResCommon/Android.bp
index 2f9fe2f..2ff02e1 100644
--- a/overlay/WifiResCommon/Android.bp
+++ b/overlay/WifiResCommon/Android.bp
@@ -1,6 +1,5 @@
 //
-// Copyright (C) 2023 The LineageOS Project
-//
+// SPDX-FileCopyrightText: 2025 The LineageOS Project
 // SPDX-License-Identifier: Apache-2.0
 //
 
diff --git a/overlay/WifiResCommon/AndroidManifest.xml b/overlay/WifiResCommon/AndroidManifest.xml
index b1995bd..662cf04 100644
--- a/overlay/WifiResCommon/AndroidManifest.xml
+++ b/overlay/WifiResCommon/AndroidManifest.xml
@@ -1,14 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2023 The LineageOS Project
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.wifi.resources.overlay.common">
-
-    <overlay
-        android:isStatic="true"
-        android:priority="100"
-        android:targetName="WifiCustomization"
-        android:targetPackage="com.android.wifi.resources" />
+    <overlay android:targetPackage="com.android.wifi.resources"
+                   android:targetName="WifiCustomization"
+                   android:isStatic="true"/>
 </manifest>
diff --git a/overlay/WifiResCommon/res/values/config.xml b/overlay/WifiResCommon/res/values/config.xml
index 9fc1d94..ebc478f 100644
--- a/overlay/WifiResCommon/res/values/config.xml
+++ b/overlay/WifiResCommon/res/values/config.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2023 The LineageOS Project
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
     <!-- boolean indicating whether the WiFi chipset has 5GHz band support.
          Note: This config is replacing the config_wifi_dual_band_support
          since more bands may now be supported (such as 6GHz), the naming dual_band
          is no longer indicative, and a separate config now exists for each band -->
     <bool name="config_wifi5ghzSupport" translatable="false">true</bool>
 
+    <!-- boolean indicating whether the WiFi chipset has 6GHz band support -->
+    <bool name="config_wifi6ghzSupport" translatable="false">true</bool>
+
     <!-- boolean indicating whether or not to auto-upgrade band setting configuration to dual bands during cloud configuration restore when device supported -->
     <bool name="config_wifiSoftapAutoUpgradeToBridgedConfigWhenSupported" translatable="false">false</bool>
 
@@ -28,15 +30,11 @@
          range string like '1-6,11'. -->
     <string name="config_wifiSoftap2gChannelList" translatable="false" />
 
-    <!-- List of allowed channels in 5GHz band for softap. If the device doesn't want to restrict
-         channels this should be empty. Values is a comma separated channel string and/or channel
-         range string like '36-48,149'. -->
-    <string name="config_wifiSoftap5gChannelList" translatable="false" />
+    <!-- Boolean indicating performing a partial initial scan is enabled -->
+    <bool name="config_wifiEnablePartialInitialScan" translatable="false">true</bool>
 
-    <!-- List of allowed channels in 6GHz band for softap. If the device doesn't want to restrict
-         channels this should be empty. Values is a comma separated channel string and/or channel
-         range string like '36-48,149'. -->
-    <string name="config_wifiSoftap6gChannelList" translatable="false" />
+    <!-- Boolean indicating connected frequency enhancement is enabled/disabled -->
+    <bool name="config_wifiConnectedFrequencyEnhancementEnabled" translatable="false">true</bool>
 
     <!-- Boolean indicating that only configurations that have the same pre-shared key will be linked -->
     <bool name="config_wifi_only_link_same_credential_configurations" translatable="false">false</bool>
@@ -50,6 +48,15 @@
     <!-- Wifi driver supports IEEE80211AC for softap -->
     <bool name="config_wifi_softap_ieee80211ac_supported" translatable="false">true</bool>
 
+    <!-- Wifi driver supports IEEE80211AX for softap -->
+    <bool name="config_wifiSoftapIeee80211axSupported" translatable="false">true</bool>
+
+    <!-- Wifi driver supports IEEE80211AX single user beamformer for softap -->
+    <bool name="config_wifiSoftapHeSuBeamformerSupported" translatable="false">true</bool>
+
+    <!-- Wifi driver supports IEEE80211AX single user beamformee for softap -->
+    <bool name="config_wifiSoftapHeSuBeamformeeSupported" translatable="false">true</bool>
+
     <!-- Wifi driver supports 6GHz band for softap when chip support 6GHz -->
     <bool name="config_wifiSoftap6ghzSupported" translatable="false">true</bool>
 
@@ -59,6 +66,20 @@
     <!-- Indicates that p2p MAC randomization is supported on this device -->
     <bool name="config_wifi_p2p_mac_randomization_supported" translatable="false">true</bool>
 
+    <!-- Indicates that dynamic country code update in AP mode is supported on this device -->
+    <bool name="config_wifiSoftApDynamicCountryCodeUpdateSupported" translatable="false">true</bool>
+
+    <!-- Indicates that dynamic country code update in STA mode is supported on this device -->
+    <bool name="config_wifiStaDynamicCountryCodeUpdateSupported" translatable="false">true</bool>
+
+    <!-- Configure wifi tcp buffersizes in the form:
+         rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max -->
+    <string name="config_wifi_tcp_buffers" translatable="false">524288,1048576,2097152,524288,1048576,4194304</string>
+    <integer name="config_wifiDisableReasonByWrongPasswordThreshold" translatable="false">2</integer>
+
+    <!-- Enable WPA2 to WPA3 auto-upgrade offload to capable Driver/Firmware -->
+    <bool name="config_wifiSaeUpgradeOffloadEnabled" translatable="false">true</bool>
+
     <!-- Wifi driver Automatic channel selection (ACS) for softap to include DFS channels -->
     <bool name="config_wifiSoftapAcsIncludeDfs" translatable="false">true</bool>
 
@@ -71,11 +92,30 @@
      -->
     <bool name="config_wifiAllowMultipleNetworksOnSameAwareNdi" translatable="false">true</bool>
 
+    <!-- Whether to use the explicit vendor HAL API: IWifiStaIface.setRoamingState for disabling fw roaming (only needed if
+         setting the bssid on the connection alone does not disable fw roaming on this chip) -->
+    <bool name="config_wifiUseHalApiToDisableFwRoaming" translatable="false">true</bool>
+
+    <!-- Indicates that SAE Hash-to-Element is supported on this device -->
+    <bool name="config_wifiSaeH2eSupported" translatable="false">true</bool>
+
     <!-- Integer threshold for max number of WifiConfigurations that can be saved on the device.
          A value of -1 indicates no limit. If a max number is specified, then under-used configs will
          be deleted to make room for new configs.-->
     <integer name="config_wifiMaxNumWifiConfigurations" translatable="false">1000</integer>
 
+    <!-- Wifi driver supports WPA3 Simultaneous Authentication of Equals (WPA3-OWE) for softap -->
+    <bool name="config_vendor_wifi_softap_owe_supported" translatable="false">true</bool>
+
+    <!-- Indicates whether or not the WLAN driver supports the NL80211_CMD_REG_CHANGE or
+         NL80211_CMD_WIPHY_REG_CHANGE events which indicate the current country code which is
+         being used by the WLAN driver. If the driver doesn't support these events
+         (configuration is `false`) then the driver must handle the setCountryCode request from
+         HAL as a blocking call. In such a case the country code will be applied
+         immediately after the country code is sent to the driver (if the method returns a
+         success). -->
+    <bool name="config_wifiDriverSupportedNl80211RegChangedEvent" translatable="false">true</bool>
+
     <!-- Wifi driver supports Opportunistic Wireless Encryption (OWE) Transition
          aka Enhanced Open for Soft-AP -->
     <bool name="config_wifiSoftapOweTransitionSupported" translatable="false">true</bool>
@@ -84,6 +124,12 @@
          aka Enhanced Open for Soft-AP -->
     <bool name="config_wifiSoftapOweSupported" translatable="false">true</bool>
 
+    <!-- Indicates whether or not the Soft AP needs to be restarted when country code changed -->
+    <bool name="config_wifiForcedSoftApRestartWhenCountryCodeChanged" translatable="false">false</bool>
+
+    <!-- Indicates whether the network-centric QoS policy feature is enabled. -->
+    <bool name="config_wifiNetworkCentricQosPolicyFeatureEnabled" translatable="false">true</bool>
+
     <!-- Lists each alternate character set per locale language for SSID translation to UTF-8. This
          will translate all SSIDs encoded with the specified character set from the native layer
          into UTF-8 SSIDs. The translated SSIDs are then converted back to the original character
@@ -96,5 +142,4 @@
     <string-array name="config_wifiCharsetsForSsidTranslation" translatable="false">
         <item>zh,GBK</item>
     </string-array>
-
 </resources>
diff --git a/overlay/WifiResTarget/Android.bp b/overlay/WifiResTarget/Android.bp
index 50c4096..04fef5b 100644
--- a/overlay/WifiResTarget/Android.bp
+++ b/overlay/WifiResTarget/Android.bp
@@ -1,6 +1,5 @@
 //
-// Copyright (C) 2023 The LineageOS Project
-//
+// SPDX-FileCopyrightText: 2025 The LineageOS Project
 // SPDX-License-Identifier: Apache-2.0
 //
 
diff --git a/overlay/WifiResTarget/AndroidManifest.xml b/overlay/WifiResTarget/AndroidManifest.xml
index 7c3615a..7c223ae 100644
--- a/overlay/WifiResTarget/AndroidManifest.xml
+++ b/overlay/WifiResTarget/AndroidManifest.xml
@@ -1,13 +1,13 @@
 <!--
-     Copyright (C) 2023 The LineageOS Project
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.wifi.resources.overlay.target">
-
-    <overlay
-        android:isStatic="true"
-        android:priority="500"
-        android:targetName="WifiCustomization"
-        android:targetPackage="com.android.wifi.resources" />
+    <overlay android:targetPackage="com.android.wifi.resources"
+                   android:targetName="WifiCustomization"
+                   android:isStatic="true"
+                   android:priority="500"
+                   android:requiredSystemPropertyName="ro.boot.product.vendor.sku"
+                   android:requiredSystemPropertyValue="kalama"/>
 </manifest>
diff --git a/overlay/WifiResTarget/res/values/config.xml b/overlay/WifiResTarget/res/values/config.xml
index 748dd96..a672a7d 100644
--- a/overlay/WifiResTarget/res/values/config.xml
+++ b/overlay/WifiResTarget/res/values/config.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2023 The LineageOS Project
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
     <!-- Wifi driver supports IEEE80211BE for softap -->
     <bool name="config_wifiSoftapIeee80211beSupported" translatable="false">true</bool>
 
@@ -26,5 +25,4 @@
     <!-- Enable concurrent restricted connectivity + internet connectivity
          Note: this is conditional on the device supporting dual concurrent STAs. -->
     <bool name="config_wifiMultiStaRestrictedConcurrencyEnabled" translatable="false">true</bool>
-
 </resources>
diff --git a/overlay/WifiResTarget_spf/Android.bp b/overlay/WifiResTarget_spf/Android.bp
index 9fc4031..598de2e 100644
--- a/overlay/WifiResTarget_spf/Android.bp
+++ b/overlay/WifiResTarget_spf/Android.bp
@@ -1,6 +1,5 @@
 //
-// Copyright (C) 2024 The LineageOS Project
-//
+// SPDX-FileCopyrightText: 2025 The LineageOS Project
 // SPDX-License-Identifier: Apache-2.0
 //
 
diff --git a/overlay/WifiResTarget_spf/AndroidManifest.xml b/overlay/WifiResTarget_spf/AndroidManifest.xml
index 57539b2..422b3eb 100644
--- a/overlay/WifiResTarget_spf/AndroidManifest.xml
+++ b/overlay/WifiResTarget_spf/AndroidManifest.xml
@@ -1,13 +1,11 @@
 <!--
-     Copyright (C) 2024 The LineageOS Project
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.wifi.resources.overlay.kalama">
-
-    <overlay
-        android:isStatic="true"
-        android:priority="500"
-        android:targetName="WifiCustomization"
-        android:targetPackage="com.android.wifi.resources" />
+    <overlay android:targetPackage="com.android.wifi.resources"
+                   android:targetName="WifiCustomization"
+                   android:isStatic="true"
+                   android:priority="500"/>
 </manifest>
diff --git a/overlay/WifiResTarget_spf/res/values/config.xml b/overlay/WifiResTarget_spf/res/values/config.xml
index 5540721..1f70c24 100644
--- a/overlay/WifiResTarget_spf/res/values/config.xml
+++ b/overlay/WifiResTarget_spf/res/values/config.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2024 The LineageOS Project
+     SPDX-FileCopyrightText: 2025 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
     <!-- boolean indicating whether the WiFi chipset has 5GHz band support.
          Note: This config is replacing the config_wifi_dual_band_support
          since more bands may now be supported (such as 6GHz), the naming dual_band
@@ -23,6 +22,15 @@
     <!-- Boolean indicating performing a partial initial scan is enabled -->
     <bool name="config_wifiEnablePartialInitialScan" translatable="false">true</bool>
 
+    <!-- Boolean indicating connected frequency enhancement is enabled/disabled -->
+    <bool name="config_wifiConnectedFrequencyEnhancementEnabled" translatable="false">true</bool>
+
+    <!-- Wifi driver supports Beacon Protection for SoftAp -->
+    <bool name="config_vendor_softap_beacon_protection_supported" translatable="false">true</bool>
+
+    <!-- Wifi driver supports Ocv for SoftAp -->
+    <bool name="config_vendor_softap_ocv_supported" translatable="false">true</bool>
+
     <!-- Wifi driver supports Automatic channel selection (ACS) for softap -->
     <bool name="config_wifi_softap_acs_supported" translatable="false">true</bool>
 
@@ -84,5 +92,4 @@
 
     <!-- Indicates whether the network-centric QoS policy feature is enabled. -->
     <bool name="config_wifiNetworkCentricQosPolicyFeatureEnabled" translatable="false">true</bool>
-
 </resources>