diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index b6e925a..e1621e4 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -79,6 +79,7 @@ endif
 WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY ?= true
 
 # Display
+TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS := (1 << 21)
 TARGET_USES_HWC2 := true
 
 # DRM
diff --git a/common.mk b/common.mk
index 95bdcab..c297c5c 100644
--- a/common.mk
+++ b/common.mk
@@ -49,7 +49,8 @@ PRODUCT_PACKAGES += \
 
 # Audio
 PRODUCT_PACKAGES += \
-    audio.a2dp.default
+    audio.a2dp.default \
+    libaacwrapper
 
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/audio/audio_policy_configuration.xml:system/etc/audio_policy_configuration.xml
@@ -69,7 +70,8 @@ PRODUCT_PACKAGES += \
 
 # Display
 PRODUCT_PACKAGES += \
-    libvulkan
+    libvulkan \
+    vendor.display.config@1.0
 
 # Doze
 PRODUCT_PACKAGES += \
@@ -145,3 +147,10 @@ PRODUCT_STATIC_BOOT_CONTROL_HAL := \
 
 PRODUCT_PACKAGES_DEBUG += \
     update_engine_client
+
+# WiFi Display
+PRODUCT_PACKAGES += \
+    libnl
+
+PRODUCT_BOOT_JARS += \
+    WfdCommon
diff --git a/proprietary-files.txt b/proprietary-files.txt
index eb8c500..91c2c1b 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -70,6 +70,14 @@ lib64/lib-imsvtutils.so
 lib64/librcc.so
 lib64/vendor.qti.imsrtpservice@1.0.so
 
+# Media
+lib64/libmmosal.so
+lib/extractors/libmmparser.so
+lib/libFileMux.so
+lib/libmmosal.so
+lib/libmmparser_lite.so
+lib/libOmxMux.so
+
 # Telephony
 -app/QtiTelephonyService/QtiTelephonyService.apk
 etc/permissions/qcrilhook.xml
@@ -83,3 +91,36 @@ framework/qcnvitems.jar
 framework/qti-telephony-common.jar|b1d392dbc9b06ac8d650b874c502da0a3fff81c7
 framework/QtiTelephonyServicelibrary.jar
 -priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
+
+# WiFi Display
+bin/wfdservice
+etc/init/wfdservice.rc
+etc/wfdconfig.xml
+etc/wfdconfigsink.xml
+-framework/WfdCommon.jar
+lib/com.qualcomm.qti.wifidisplayhal@1.0.so
+lib/libdisplayconfig.so
+lib/libmmrtpdecoder.so
+lib/libmmrtpencoder.so
+lib/libqdMetaData.system.so
+lib/libwfdaac.so
+lib/libwfdavenhancements.so
+lib/libwfdclient.so
+lib/libwfdcodecv4l2.so
+lib/libwfdcommonutils.so
+lib/libwfdconfigutils.so
+lib/libwfdmminterface.so
+lib/libwfdmmsink.so
+lib/libwfdmmsrc.so
+lib/libwfdnative.so|60e20185f00ed7f3e961787869f83414b820d677
+lib/libwfdrtsp.so
+lib/libwfdservice.so
+lib/libwfdsm.so
+lib/libwfduibcinterface.so
+lib/libwfduibcsink.so
+lib/libwfduibcsinkinterface.so
+lib/libwfduibcsrc.so
+lib/libwfduibcsrcinterface.so
+lib64/libwfdclient.so
+lib64/libwfdnative.so|e6553d35102f50b5cf6dbce9b75a4a5c715837b7
+-priv-app/WfdService/WfdService.apk
diff --git a/system_prop.mk b/system_prop.mk
index 12df419..7d2d205 100644
--- a/system_prop.mk
+++ b/system_prop.mk
@@ -29,6 +29,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 # Display
 PRODUCT_PROPERTY_OVERRIDES += \
     debug.gralloc.gfx_ubwc_disable=0 \
+    debug.sf.enable_hwc_vds=1 \
     debug.sf.latch_unsignaled=1 \
     persist.vendor.color.matrix=2