diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index f6b1ea44..4560e89e 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -228,6 +228,9 @@ BOARD_VENDOR_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/vendor
 BOARD_PLAT_PUBLIC_SEPOLICY_DIR += $(COMMON_PATH)/sepolicy/public
 BOARD_PLAT_PRIVATE_SEPOLICY_DIR += $(COMMON_PATH)/sepolicy/private
 
+# SurfaceFlinger
+TARGET_USE_AOSP_SURFACEFLINGER := true
+
 # Treble
 PRODUCT_FULL_TREBLE_OVERRIDE := true
 PRODUCT_VENDOR_MOVE_ENABLED := true
diff --git a/common_prop.mk b/common_prop.mk
index 6b2978d6..67f0b2f9 100644
--- a/common_prop.mk
+++ b/common_prop.mk
@@ -273,7 +273,12 @@ PRODUCT_PROPERTY_OVERRIDES += \
     ro.surface_flinger.force_hwc_copy_for_virtual_displays=true \
     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.protected_contents=true \
+    ro.surface_flinger.use_smart_90_for_video=true \
+    ro.surface_flinger.set_display_power_timer_ms=10000 \
+    ro.surface_flinger.set_touch_timer_ms=5000 \
+    ro.surface_flinger.set_idle_timer_ms=9000 \
+    ro.surface_flinger.wcg_composition_dataspace=143261696
 
 # System restart
 PRODUCT_PROPERTY_OVERRIDES += \