diff --git a/akita/BoardConfig.mk b/akita/BoardConfig.mk
index dde0a87..717fea7 100644
--- a/akita/BoardConfig.mk
+++ b/akita/BoardConfig.mk
@@ -22,6 +22,9 @@ BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
 BOARD_KERNEL_CMDLINE += g2d.load_sequential=1
 BOARD_KERNEL_CMDLINE += samsung_iommu_v9.load_sequential=1
 
+RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_AKITA_RADIO_DIR)
+RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_AKITA_RADIOCFG_DIR)
+
 TARGET_BOARD_INFO_FILE := device/google/akita/board-info.txt
 TARGET_BOOTLOADER_BOARD_NAME := akita
 ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
diff --git a/device-akita.mk b/device-akita.mk
index 11c6919..94de1fd 100644
--- a/device-akita.mk
+++ b/device-akita.mk
@@ -351,7 +351,7 @@ endif
 
 # Display
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=1000
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=1500
 
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.udfps.als_feed_forward_supported=true \
@@ -386,7 +386,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=2
+    ro.vendor.build.svn=9
 
 # Keyboard height ratio and bottom padding in dp for portrait mode
 PRODUCT_PRODUCT_PROPERTIES += \
@@ -396,3 +396,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Enable DeviceAsWebcam support
 PRODUCT_VENDOR_PROPERTIES += \
     ro.usb.uvc.enabled=true
+
+# Window Extensions
+$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
+
+# Disable Settings large-screen optimization enabled by Window Extensions
+PRODUCT_SYSTEM_PROPERTIES += \
+    persist.settings.large_screen_opt.enabled=false
diff --git a/location/gnssd/release/android.hardware.gnss-service b/location/gnssd/release/android.hardware.gnss-service
index 867f055..22efdd8 100644
Binary files a/location/gnssd/release/android.hardware.gnss-service and b/location/gnssd/release/android.hardware.gnss-service differ
diff --git a/location/gnssd/release/gnssd b/location/gnssd/release/gnssd
index 20cc957..9b7cfa8 100644
Binary files a/location/gnssd/release/gnssd and b/location/gnssd/release/gnssd differ
diff --git a/location/gnssd/release/gps.cfg b/location/gnssd/release/gps.cfg
index 41e474d..5975716 100644
--- a/location/gnssd/release/gps.cfg
+++ b/location/gnssd/release/gps.cfg
@@ -160,6 +160,7 @@ GlueLayer_LPPCpBitmask=0x17
 GlueLayer_IsCpLteNeighborCellEnable=1
 GlueLayer_isReqDBHFromFwRefLoc=1
 GlueLayer_isReqUBPFromPressureSensor=1
+GlueLayer_IsRilCIDReqEnable=0
 GlueLayer_IsMemsEnable=1
 GlueLayer_MeasCorrCap=7
 Chip_Configuration_mems_data_Configuration=5
@@ -187,6 +188,7 @@ isUseUncalAccel=1
 GNSS_CARRIER_CONFIG_BEGIN
 # DEFAULT
 GNSS_CARRIER_ID=0
+ENABLE_CAPS_OTDOA=1
 ENABLE_2G_CP_CAPS_MSA=1
 ENABLE_2G_CP_CAPS_MSB=1
 ENABLE_3G_CP_CAPS_MSA=1
@@ -226,6 +228,7 @@ ENABLE_NLP_IN_AGNSS=1
 ENABLE_LPP_HA_GAD_SHAPE=1
 # VZW
 GNSS_CARRIER_ID=3
+ENABLE_CAPS_OTDOA=0
 ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
 SUPL_UT2_SEC=10
diff --git a/location/gnssd/release/gps_user.cfg b/location/gnssd/release/gps_user.cfg
index 70b4f52..ac99937 100644
--- a/location/gnssd/release/gps_user.cfg
+++ b/location/gnssd/release/gps_user.cfg
@@ -51,6 +51,7 @@ GlueLayer_LPPCpBitmask=0x17
 GlueLayer_IsCpLteNeighborCellEnable=1
 GlueLayer_isReqDBHFromFwRefLoc=1
 GlueLayer_isReqUBPFromPressureSensor=1
+GlueLayer_IsRilCIDReqEnable=0
 GlueLayer_IsMemsEnable=1
 GlueLayer_MeasCorrCap=7
 Chip_Configuration_mems_data_Configuration=5
@@ -70,6 +71,7 @@ isForceHighAccuracyMode=1
 isUseUncalAccel=1
 GNSS_CARRIER_CONFIG_BEGIN
 GNSS_CARRIER_ID=0
+ENABLE_CAPS_OTDOA=1
 ENABLE_2G_CP_CAPS_MSA=1
 ENABLE_2G_CP_CAPS_MSB=1
 ENABLE_3G_CP_CAPS_MSA=1
@@ -106,6 +108,7 @@ ENABLE_NLP_IN_LPPE=0
 ENABLE_NLP_IN_AGNSS=1
 ENABLE_LPP_HA_GAD_SHAPE=1
 GNSS_CARRIER_ID=3
+ENABLE_CAPS_OTDOA=0
 ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
 SUPL_UT2_SEC=10
diff --git a/location/gnssd/release/kepler.bin b/location/gnssd/release/kepler.bin
index 971378c..382b8e5 100644
Binary files a/location/gnssd/release/kepler.bin and b/location/gnssd/release/kepler.bin differ