diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index a3f88ed..aba1729 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -122,11 +122,9 @@ WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY ?= true
 
 # Display
 BOARD_USES_ADRENO := true
-NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
 SF_VSYNC_EVENT_PHASE_OFFSET_NS := 2000000
 TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS := 0x02000000U
 TARGET_CONTINUOUS_SPLASH_ENABLED := true
-TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS := true
 TARGET_USES_ION := true
 TARGET_USES_OVERLAY := true
 TARGET_USES_GRALLOC1 := true
@@ -136,7 +134,6 @@ VSYNC_EVENT_PHASE_OFFSET_NS := 6000000
 
 MAX_EGL_CACHE_KEY_SIZE := 12*1024
 MAX_EGL_CACHE_SIZE := 2048*1024
-MAX_VIRTUAL_DISPLAY_DIMENSION := 2048
 
 # Encryption
 TARGET_HW_DISK_ENCRYPTION := true
diff --git a/msm8976.mk b/msm8976.mk
index 30d3faf..963d9a0 100644
--- a/msm8976.mk
+++ b/msm8976.mk
@@ -266,6 +266,12 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     android.hardware.sensors@1.0-impl
 
+# Surfaceflinger
+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=2048
+
 # TimeKeep
 PRODUCT_PACKAGES += \
     timekeep \