diff --git a/universal7885-common/overlay/frameworks/base/core/res/res/values/config.xml b/universal7885-common/overlay/frameworks/base/core/res/res/values/config.xml
index f36c128..6d4eff2 100644
--- a/universal7885-common/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/universal7885-common/overlay/frameworks/base/core/res/res/values/config.xml
@@ -770,4 +770,7 @@
          manually by the user. Off by default, since the expected haptic feedback may not be
          available on some devices. -->
     <bool name="config_enableHapticTextHandle">true</bool>
+
+    <!-- Whether we use large screen shade header which takes only one row compared to QS header -->
+    <bool name="config_use_large_screen_shade_header">true</bool>
 </resources>
diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index 83c748f..8a4ded3 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -12,6 +12,9 @@ PRODUCT_BROKEN_VERIFY_USES_LIBRARIES := true
 # Derp
 USE_LEGACY_BOOTANIMATION := true
 
+# Disable Postrender Cleanup
+TARGET_DISABLE_POSTRENDER_CLEANUP := true
+
 # For *_auto_generated_rro_vendor.apk
 PRODUCT_ENFORCE_RRO_TARGETS := framework-res SystemUI Bluetooth
 PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS := # leave it empty
diff --git a/universal7885-common/vendor.prop b/universal7885-common/vendor.prop
index 63bf2c1..3f1fd28 100644
--- a/universal7885-common/vendor.prop
+++ b/universal7885-common/vendor.prop
@@ -33,13 +33,10 @@ ro.surface_flinger.max_frame_buffer_acquired_buffers=3
 debug.sf.enable_hwc_vds=0
 debug.sf.latch_unsignaled=1
 debug.sf.enable_advanced_sf_phase_offset=1
-debug.sf.use_phase_offsets_as_durations=1
-debug.sf.late.sf.duration=10500000
-debug.sf.late.app.duration=20500000
-debug.sf.early.sf.duration=16000000
-debug.sf.early.app.duration=16500000
-debug.sf.earlyGl.sf.duration=13500000
-debug.sf.earlyGl.app.duration=21000000
+ro.surface_flinger.set_idle_timer_ms=80
+ro.surface_flinger.set_touch_timer_ms=200
+ro.surface_flinger.set_display_power_timer_ms=1000
+ro.surface_flinger.use_content_detection_for_refresh_rate=true
 debug.sf.disable_client_composition_cache=1
 ro.surface_flinger.max_frame_buffer_acquired_buffers=3
 
@@ -47,7 +44,7 @@ ro.surface_flinger.max_frame_buffer_acquired_buffers=3
 vendor.display.disable_rotator_downscale=1
 vendor.display.disable_scaler=0
 persist.sys.sf.color_mode=0
-persist.sys.sf.color_saturation=1.25
+persist.sys.sf.color_saturation=1.20
 
 ## SoC
 ro.soc.manufacturer=samsung