diff --git a/properties/system.prop b/properties/system.prop
index ad0c3ffd..94baded9 100644
--- a/properties/system.prop
+++ b/properties/system.prop
@@ -56,6 +56,8 @@ ro.qualcomm.cabl=0
 sdm.debug.disable_skip_validate=1
 debug.renderengine.backend=skiaglthreaded
 debug.hwui.renderer=skiagl
+ro.hwui.render_ahead=20
+ro.config.avoid_gfx_accel=true
 
 # DPM
 persist.vendor.dpm.loglevel=0
diff --git a/properties/vendor.prop b/properties/vendor.prop
index 631228eb..ed6a5a86 100644
--- a/properties/vendor.prop
+++ b/properties/vendor.prop
@@ -112,7 +112,6 @@ bluetooth.profile.pbap.server.enabled?=true
 bluetooth.profile.sap.server.enabled?=true
 persist.bluetooth.bluetooth_audio_hal.disabled=false
 ro.vendor.bluetooth.wipower=false
-persist.vendor.bt.a2dp_offload_cap=sbc-aptx-aptxhd-aac-ldac
 persist.vendor.bt.aac_frm_ctl.enabled=true
 persist.vendor.qcom.bluetooth.soc=cherokee
 ro.bluetooth.a2dp_offload.supported=true
@@ -157,7 +156,6 @@ vendor.gralloc.enable_fb_ubwc=1
 video.disable.ubwc=1
 vendor.video.disable.ubwc=1
 debug.sf.auto_latch_unsignaled=true
-ro.hwui.render_ahead=20
 
 # FS-verity
 ro.apk_verity.mode=2
@@ -216,7 +214,6 @@ telephony.lteOnCdmaDevice=1
 debug.egl.hw=1
 debug.enable.sglscale=1
 debug.sf.recomputecrop=0
-ro.config.avoid_gfx_accel=true
 
 # Sensors
 ro.vendor.sensors.facing=false