diff --git a/groups/codec2/false/default b/groups/codec2/false/default
deleted file mode 120000
index 331d858ce..000000000
--- a/groups/codec2/false/default
+++ /dev/null
@@ -1 +0,0 @@
-default
\ No newline at end of file
diff --git a/groups/codec2/true/auto_hal.in b/groups/codec2/true/auto_hal.in
index cb526e52f..ce2db2f3a 100644
--- a/groups/codec2/true/auto_hal.in
+++ b/groups/codec2/true/auto_hal.in
@@ -1,7 +1,7 @@
 DG2_IDS=(
     "0x4f80" "0x4f81" "0x4f82" "0x4f83" "0x4f84" "0x4f85" "0x4f86" "0x4f87" "0x4f88"
     "0x5690" "0x5691" "0x5692" "0x5693" "0x5694" "0x5695" "0x5696" "0x5697" "0x5698"
-    "0x56a0" "0x56a1" "0x56a2" "0x56a3" "0x56a4" "0x56a5" "0x56a6" "0x56a7" "0x56a8" "0x56a9"
+    "0x56a0" "0x56a1" "0x56a2" "0x56a3" "0x56a4" "0x56a5" "0x56a6" "0x56a7" "0x56a8" "0x56a9" "0x56af"
     "0x56b0" "0x56b1" "0x56b2" "0x56b3" "0x56ba" "0x56bb" "0x56bc" "0x56bd" "0x56be" "0x56bf"
 )
 
diff --git a/groups/codec2/true/media_codecs_intel_c2_video.xml b/groups/codec2/true/media_codecs_intel_c2_video.xml
index 45fa12c51..8fbe61a6c 100644
--- a/groups/codec2/true/media_codecs_intel_c2_video.xml
+++ b/groups/codec2/true/media_codecs_intel_c2_video.xml
@@ -129,8 +129,7 @@ and updated to vendor media codecs.
             <Limit name="performance-point-1920x1080" value="180" />
             <Feature name="bitrate-modes" value="VBR,CBR" />
             <!--Feature name="intra-refresh" /-->
-            <Limit name="dumpOutput" value="false" />
-            <Limit name="lowPowerMode" value="false" />
+            <Limit name="low-power-mode" value="false" />
         </MediaCodec>
 {{/hw_ve_h264}}
 
diff --git a/groups/codec2/true/media_codecs_intel_c2_video_gen13.xml b/groups/codec2/true/media_codecs_intel_c2_video_gen13.xml
index 660346cb6..3ec7d0bbb 100644
--- a/groups/codec2/true/media_codecs_intel_c2_video_gen13.xml
+++ b/groups/codec2/true/media_codecs_intel_c2_video_gen13.xml
@@ -104,8 +104,7 @@ and updated to vendor media codecs.
             <Limit name="performance-point-3840x2160" value="120" />
             <Limit name="performance-point-1920x1080" value="180" />
             <!--Feature name="intra-refresh" /-->
-            <Limit name="dumpOutput" value="false" />
-            <Limit name="lowPowerMode" value="false" />
+            <Limit name="low-power-mode" value="false" />
         </MediaCodec>
 
         <MediaCodec name="c2.intel.hevc.encoder" type="video/hevc" >
diff --git a/groups/codec2/true/product.mk b/groups/codec2/true/product.mk
index 2a1388891..055234426 100755
--- a/groups/codec2/true/product.mk
+++ b/groups/codec2/true/product.mk
@@ -26,7 +26,12 @@ BOARD_HAVE_MEDIASDK_CODEC2 := true
 {{#use_onevpl}}
 PRODUCT_PACKAGES += \
     libvpl \
-    libmfx-gen
+    libmfx-gen \
+    hello-encode \
+    vpl_sample_decode \
+    vpl_sample_encode \
+    vpl_sample_multi_transcode \
+    vpl_sample_vpp
 USE_ONEVPL := true
 {{/use_onevpl}}
 
diff --git a/groups/media/auto/igfx_user_feature_next.txt b/groups/media/auto/igfx_user_feature_next.txt
index 6cdf1fa6f..51c4f9aef 100644
--- a/groups/media/auto/igfx_user_feature_next.txt
+++ b/groups/media/auto/igfx_user_feature_next.txt
@@ -1,9 +1,4 @@
 [config]
-Perf Profiler Enable=1
-Perf Profiler Output File Name=linux_perf_out.bin
-Perf Profiler Multi Process Support=0
-Perf Profiler Register 8=1835148
-Perf Profiler Buffer Size=10000000
 Enable HCP Scalability Decode=0
 Disable Media Encode Scalability=1
 
diff --git a/groups/media/auto/product.mk b/groups/media/auto/product.mk
index 6b1dcd4a7..577abba36 100644
--- a/groups/media/auto/product.mk
+++ b/groups/media/auto/product.mk
@@ -50,4 +50,4 @@ PRODUCT_PACKAGES += libhdcpsdk
 PRODUCT_PACKAGES += lihdcpcommon
 
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.stagefright.c2inputsurface=-1
-
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.has_HDR_display=false