diff --git a/device-common.mk b/device-common.mk
index bf738c34..ece4678b 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -44,6 +44,9 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.thermal_warmreset = true
 
+# Set the max page size to 4096 (b/300367402)
+PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 4096
+
 # Indicate that the bootloader supports the MTE developer option switch
 # (MISC_MEMTAG_MODE_MEMTAG_ONCE), with the exception of _fullmte products that
 # force enable MTE.
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 73ba0830..60563321 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -286,5 +286,5 @@
     <bool translatable="false" name="skip_restoring_network_selection">true</bool>
 
     <!-- Enable variable refresh rate when typing. -->
-    <bool name="config_variableRefreshRateTypingSupported">true</bool>
+    <bool name="config_variableRefreshRateTypingSupported">false</bool>
 </resources>