diff --git a/FalseLocks/Android.mk b/FalseLocks/Android.mk
index 008c0b4..bc9f6ab 100644
--- a/FalseLocks/Android.mk
+++ b/FalseLocks/Android.mk
@@ -2,5 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := treble-overlay-SystemUI-FalseLocks
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
 include $(BUILD_PACKAGE)
diff --git a/NavBar/Android.mk b/NavBar/Android.mk
index 4e8a116..660b652 100644
--- a/NavBar/Android.mk
+++ b/NavBar/Android.mk
@@ -2,5 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := treble-overlay-NavBar
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
 include $(BUILD_PACKAGE)
diff --git a/Nokia/PNX-8.1-X7-SystemUI/Android.mk b/Nokia/PNX-8.1-X7-SystemUI/Android.mk
index 8689b05..ef3a893 100644
--- a/Nokia/PNX-8.1-X7-SystemUI/Android.mk
+++ b/Nokia/PNX-8.1-X7-SystemUI/Android.mk
@@ -2,5 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := treble-overlay-nokia-pnx-8.1-x7-systemui
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
 include $(BUILD_PACKAGE)
diff --git a/OnePlus/OP6T-SystemUI/Android.mk b/OnePlus/OP6T-SystemUI/Android.mk
index 017cc4b..efb3e86 100644
--- a/OnePlus/OP6T-SystemUI/Android.mk
+++ b/OnePlus/OP6T-SystemUI/Android.mk
@@ -2,5 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := treble-overlay-oneplus-op6t-systemui
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
 include $(BUILD_PACKAGE)
diff --git a/Telephony-LTE/Android.mk b/Telephony-LTE/Android.mk
index ae4fd92..a77f9f3 100644
--- a/Telephony-LTE/Android.mk
+++ b/Telephony-LTE/Android.mk
@@ -2,5 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := treble-overlay-Telephony-LTE
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
 include $(BUILD_PACKAGE)
diff --git a/Telephony/HW-IMS/Android.mk b/Telephony/HW-IMS/Android.mk
index 0232235..090f8a2 100644
--- a/Telephony/HW-IMS/Android.mk
+++ b/Telephony/HW-IMS/Android.mk
@@ -2,5 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := treble-overlay-telephony-hw-ims
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
 include $(BUILD_PACKAGE)
diff --git a/Telephony/SLSI-IMS/Android.mk b/Telephony/SLSI-IMS/Android.mk
index fdaccdf..b5ffd1b 100644
--- a/Telephony/SLSI-IMS/Android.mk
+++ b/Telephony/SLSI-IMS/Android.mk
@@ -2,5 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := treble-overlay-telephony-slsi-ims
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
 include $(BUILD_PACKAGE)
diff --git a/Telephony/SPRD-IMS/Android.mk b/Telephony/SPRD-IMS/Android.mk
index f6ecead..813db69 100644
--- a/Telephony/SPRD-IMS/Android.mk
+++ b/Telephony/SPRD-IMS/Android.mk
@@ -2,5 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := treble-overlay-telephony-sprd-ims
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
 include $(BUILD_PACKAGE)
diff --git a/Xiaomi/MiMix3-SystemUI/Android.mk b/Xiaomi/MiMix3-SystemUI/Android.mk
index 9834ca2..f5b027d 100644
--- a/Xiaomi/MiMix3-SystemUI/Android.mk
+++ b/Xiaomi/MiMix3-SystemUI/Android.mk
@@ -2,5 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := treble-overlay-xiaomi-mimix3-systemui
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
 include $(BUILD_PACKAGE)
diff --git a/Xiaomi/RedmiNote6Pro-SystemUI/Android.mk b/Xiaomi/RedmiNote6Pro-SystemUI/Android.mk
index 0b7ba2a..6e33d9c 100644
--- a/Xiaomi/RedmiNote6Pro-SystemUI/Android.mk
+++ b/Xiaomi/RedmiNote6Pro-SystemUI/Android.mk
@@ -2,5 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := treble-overlay-xiaomi-redminote6pro-systemui
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
 include $(BUILD_PACKAGE)
diff --git a/overlay.mk b/overlay.mk
index 3205eb2..550837d 100644
--- a/overlay.mk
+++ b/overlay.mk
@@ -19,6 +19,7 @@ PRODUCT_PACKAGES += \
 	treble-overlay-duoqin-qin2pro \
 	treble-overlay-essential-ph_1 \
 	treble-overlay-fairphone-fp3 \
+	treble-overlay-fairphone-fp4 \
 	treble-overlay-highpriomisc \
 	treble-overlay-htc-exodus1 \
 	treble-overlay-htc-u12plus \
@@ -286,6 +287,7 @@ PRODUCT_PACKAGES += \
 	treble-overlay-xiaomi-mimix3-systemui \
 	treble-overlay-xiaomi-mipad4 \
 	treble-overlay-xiaomi-mipad5pro5g \
+	treble-overlay-xiaomi-mipad5 \
 	treble-overlay-xiaomi-miplay \
 	treble-overlay-xiaomi-pocof1 \
 	treble-overlay-xiaomi-pocof4 \