diff --git a/common.mk b/common.mk
index 5e6bcf1..c7337ef 100644
--- a/common.mk
+++ b/common.mk
@@ -503,8 +503,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
     ro.surface_flinger.protected_contents=true \
     ro.surface_flinger.use_color_management=true \
     ro.surface_flinger.refresh_rate_switching=true \
-    ro.surface_flinger.wcg_composition_dataspace=143261696 \
-    ro.surface_flinger.use_content_detection_for_refresh_rate=true
+    ro.surface_flinger.wcg_composition_dataspace=143261696
 
 # Disable Rescue Party on userdebug & eng build
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
diff --git a/vendor.prop b/vendor.prop
index 0e9aa25..a71b4ea 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -230,6 +230,12 @@ persist.vendor.radio.rat_on=combine
 persist.vendor.radio.sib16_support=1
 ro.com.android.dataroaming=false
 
+# Refresh Rate
+ro.surface_flinger.use_content_detection_for_refresh_rate=true
+ro.surface_flinger.set_display_power_timer_ms=1000
+ro.surface_flinger.set_idle_timer_ms=80
+ro.surface_flinger.set_touch_timer_ms=200
+
 # Seamless transfer
 sys.fflag.override.settings_seamless_transfer=true