diff --git a/device.mk b/device.mk
index 570144cb43dd4b4ba6b4fd126dddb376c4b304ef..17ad769a2a600a1641f0de245188d431b0da9828 100644
--- a/device.mk
+++ b/device.mk
@@ -320,13 +320,12 @@ PRODUCT_PACKAGES += \
     libstagefrighthw
 
 # Overlay
-DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay-lineage
-
 PRODUCT_PACKAGES += \
     CarrierConfigResCommon \
     eCameraTarget \
     FrameworksResCommon \
     FrameworksResTarget \
+    SettingsResCommon \
     SystemUIResCommon \
     SystemUIResTarget \
     TelephonyResCommon \
diff --git a/overlay-lineage/packages/apps/Settings/res/values/config.xml b/overlay-lineage/packages/apps/Settings/res/values/config.xml
deleted file mode 100644
index 7050a9828f2e91d66f6537c492c1784bb7612804..0000000000000000000000000000000000000000
--- a/overlay-lineage/packages/apps/Settings/res/values/config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2021, The LineageOS Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Whether to show min refresh rate in display settings -->
-    <bool name="config_show_min_refresh_rate_switch">true</bool>
-</resources>
diff --git a/overlay/FrameworksResCommon/res/values/config.xml b/overlay/FrameworksResCommon/res/values/config.xml
index 3e117ff55a195c91cc216f0355ab2cbb8f16c15d..d37afc88db8208a744559904d57e85816dfb0c48 100644
--- a/overlay/FrameworksResCommon/res/values/config.xml
+++ b/overlay/FrameworksResCommon/res/values/config.xml
@@ -94,11 +94,25 @@
          the restoring is handled by modem if it is true -->
     <bool name="skip_restoring_network_selection">true</bool>
 
-    <!-- The default peak refresh rate for a given device. Change this value if you want to prevent
-         the framework from using higher refresh rates, even if display modes with higher refresh
-         rates are available from hardware composer. Only has an effect if the value is
-         non-zero. -->
-    <integer name="config_defaultPeakRefreshRate">60</integer>
+    <!-- The default refresh rate for a given device. Change this value to set a higher default
+         refresh rate. If the hardware composer on the device supports display modes with a higher
+         refresh rate than the default value specified here, the framework may use those higher
+         refresh rate modes if an app chooses one by setting preferredDisplayModeId or calling
+         setFrameRate().
+         If a non-zero value is set for config_defaultPeakRefreshRate, then
+         config_defaultRefreshRate may be set to 0, in which case the value set for
+         config_defaultPeakRefreshRate will act as the default frame rate. -->
+    <integer name="config_defaultPeakRefreshRate">240</integer>
+
+    <!-- The default refresh rate for a given device. Change this value to set a higher default
+         refresh rate. If the hardware composer on the device supports display modes with a higher
+         refresh rate than the default value specified here, the framework may use those higher
+         refresh rate modes if an app chooses one by setting preferredDisplayModeId or calling
+         setFrameRate().
+         If a non-zero value is set for config_defaultPeakRefreshRate, then
+         config_defaultRefreshRate may be set to 0, in which case the value set for
+         config_defaultPeakRefreshRate will act as the default frame rate. -->
+    <integer name="config_defaultRefreshRate">0</integer>
 
     <!--  Maximum number of supported users -->
     <integer name="config_multiuserMaximumUsers">4</integer>
diff --git a/overlay/SettingsResCommon/Android.bp b/overlay/SettingsResCommon/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..e007bd62825d18d2fb080df26f0427907227ff27
--- /dev/null
+++ b/overlay/SettingsResCommon/Android.bp
@@ -0,0 +1,9 @@
+//
+// Copyright (C) 2022 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "SettingsResCommon",
+    vendor: true,
+}
diff --git a/overlay/SettingsResCommon/AndroidManifest.xml b/overlay/SettingsResCommon/AndroidManifest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c36f6855924c5dc8384bd5f06d903037563e946a
--- /dev/null
+++ b/overlay/SettingsResCommon/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.settings.common">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="800"
+        android:targetPackage="com.android.settings" />
+</manifest>
diff --git a/overlay/SettingsResCommon/res/values/config.xml b/overlay/SettingsResCommon/res/values/config.xml
new file mode 100644
index 0000000000000000000000000000000000000000..bc7b11a80419f09e5fd6acc85fc916031bcfdff1
--- /dev/null
+++ b/overlay/SettingsResCommon/res/values/config.xml
@@ -0,0 +1,4 @@
+<resources>
+    <!-- Whether to show Smooth Display feature in Settings Options -->
+    <bool name="config_show_smooth_display">true</bool>
+</resources>
diff --git a/vendor.prop b/vendor.prop
index 8469cd79a44f1cbb0c609b101fde0061f5f38d41..1ebd817ea7b75d8edc991e7372cb19d35bbc485a 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -134,6 +134,7 @@ ro.surface_flinger.max_frame_buffer_acquired_buffers=3
 ro.surface_flinger.max_virtual_display_dimension=4096
 ro.surface_flinger.protected_contents=true
 ro.surface_flinger.use_color_management=true
+ro.surface_flinger.use_content_detection_for_refresh_rate=true
 ro.surface_flinger.wcg_composition_dataspace=143261696
 
 # Incremental FS