diff --git a/utils/emulator/common.mk b/utils/emulator/common.mk
index f853476..4cf6b10 100644
--- a/utils/emulator/common.mk
+++ b/utils/emulator/common.mk
@@ -71,3 +71,5 @@
 
 # Add our overlays
 DEVICE_PACKAGE_OVERLAYS += vendor/omni/overlay/common
+
+WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := true
diff --git a/utils/emulator/overlay/frameworks/base/core/res/res/values/config.xml b/utils/emulator/overlay/frameworks/base/core/res/res/values/config.xml
index d3c48fa..7be2e5f 100644
--- a/utils/emulator/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/utils/emulator/overlay/frameworks/base/core/res/res/values/config.xml
@@ -26,5 +26,6 @@
     <string name="config_deviceKeyHandlerClass" translatable="false">org.omnirom.device.KeyHandler</string>
     <!-- make sure you enable this only if your device supports deep slepp
     with active proximity sensor event listener -->
-    <bool name="config_proxiSensorWakupCheck">false</bool>
+    <bool name="config_proxiSensorWakupCheck">true</bool>
+    <bool name="config_showNavigationBar">true</bool>
 </resources>