diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc
index 2fc685f..9866297 100644
--- a/conf/init.zumapro.board.rc
+++ b/conf/init.zumapro.board.rc
@@ -392,6 +392,7 @@ on fs
     chown system system /sys/class/backlight/panel0-backlight/dimming_on
     chown system system /sys/class/backlight/panel0-backlight/hbm_mode
     chown system system /sys/class/backlight/panel0-backlight/local_hbm_mode
+    chown system system /sys/class/backlight/panel0-backlight/local_hbm_delay_frames
     chown system system /sys/devices/platform/exynos-drm/primary-panel/gamma
     chown system system /sys/devices/platform/exynos-drm/primary-panel/min_vrefresh
     chown system system /sys/devices/platform/exynos-drm/primary-panel/idle_delay_ms
diff --git a/conf/init.zumapro.soc.rc b/conf/init.zumapro.soc.rc
index ef3dbab..ec0f6bc 100644
--- a/conf/init.zumapro.soc.rc
+++ b/conf/init.zumapro.soc.rc
@@ -181,9 +181,9 @@ on property:sys.boot_completed=1
     write /sys/kernel/vendor_mm/kcompactd_cpu_affinity 7f
 
     # Restore prefer idle
-    write /proc/vendor_sched/groups/ta/preferred_idle_mask_low 0xff
-    write /proc/vendor_sched/groups/ta/preferred_idle_mask_mid 0xff
-    write /proc/vendor_sched/groups/ta/preferred_idle_mask_high 0xff
+    write /proc/vendor_sched/groups/ta/preferred_idle_mask_low 0x7f
+    write /proc/vendor_sched/groups/ta/preferred_idle_mask_mid 0x7f
+    write /proc/vendor_sched/groups/ta/preferred_idle_mask_high 0x7f
     write /proc/vendor_sched/groups/fg/preferred_idle_mask_low 0xff
     write /proc/vendor_sched/groups/fg/preferred_idle_mask_mid 0xff
     write /proc/vendor_sched/groups/fg/preferred_idle_mask_high 0xff
diff --git a/device.mk b/device.mk
index 2b2ac91..d0abc45 100644
--- a/device.mk
+++ b/device.mk
@@ -224,6 +224,7 @@ ifneq ($(BOARD_WITHOUT_RADIO),true)
 # $(USE_LASSEN_OEMHOOK) is true and $(BOARD_WITHOUT_RADIO) is not true.
 PRODUCT_SOONG_NAMESPACES += vendor/google/tools/power-anomaly-sitril
 $(call soong_config_set,sitril,use_lassen_oemhook_with_radio,true)
+$(call soong_config_set,grilservice,use_google_qns,true)
 
 $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device-vendor.mk)
 
diff --git a/manifest.xml b/manifest.xml
index 69a1bcd..5728c90 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,13 +1,4 @@
 <manifest version="1.0" type="device" target-level="8">
-    <hal format="hidl">
-        <name>android.hardware.graphics.mapper</name>
-        <transport arch="32+64">passthrough</transport>
-        <version>4.0</version>
-        <interface>
-            <name>IMapper</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="aidl">
         <name>android.hardware.boot</name>
         <fqname>IBootControl/default</fqname>