diff --git a/data/etc/user/advancedFeatures.ini b/data/etc/google/user/advancedFeatures.ini
similarity index 92%
rename from data/etc/user/advancedFeatures.ini
rename to data/etc/google/user/advancedFeatures.ini
index a63f367450a637945f2c2024a3480dd808218f04..7ad2fa81b2f616cdf2b79f57b5faf27a1fcb3a93 100644
--- a/data/etc/user/advancedFeatures.ini
+++ b/data/etc/google/user/advancedFeatures.ini
@@ -9,3 +9,4 @@ IntelPerformanceMonitoringUnit = on
 Wifi = on
 HostComposition = on
 DynamicPartition = on
+MultiDisplay = on
diff --git a/data/etc/google/userdebug/advancedFeatures.ini b/data/etc/google/userdebug/advancedFeatures.ini
new file mode 100644
index 0000000000000000000000000000000000000000..775e5af7d1e43f8f26a04b8732e718117345c860
--- /dev/null
+++ b/data/etc/google/userdebug/advancedFeatures.ini
@@ -0,0 +1,13 @@
+GrallocSync = on
+LogcatPipe = on
+GLAsyncSwap = on
+GLESDynamicVersion = on
+GLDMA = on
+EncryptUserData = on
+IntelPerformanceMonitoringUnit = on
+Wifi = on
+HostComposition = on
+RefCountPipe = on
+VirtioInput = on
+DynamicPartition = on
+MultiDisplay = on