diff --git a/base b/base
index f5f279350..3b9c5c1ca 160000
--- a/base
+++ b/base
@@ -1 +1 @@
-Subproject commit f5f2793506a56a3ff958722289faa6456068a6bd
+Subproject commit 3b9c5c1ca3d231fd399d5b9fe0d82fcd6fa6ebfd
diff --git a/frontend/device/android/device.lua b/frontend/device/android/device.lua
index 1157d141d..57da72ef0 100644
--- a/frontend/device/android/device.lua
+++ b/frontend/device/android/device.lua
@@ -103,7 +103,7 @@ function Device:init()
     end
 
     -- check if we enabled support for wakelocks
-    if G_reader_settings:isTrue("enable_android_wakelock") then
+    if G_reader_settings:isTrue("enable_android_wakelock") or android.needsWakelocks() then
         android.setWakeLock(true)
     end
 
diff --git a/frontend/ui/elements/common_settings_menu_table.lua b/frontend/ui/elements/common_settings_menu_table.lua
index c3ffc57ff..a0afcd887 100644
--- a/frontend/ui/elements/common_settings_menu_table.lua
+++ b/frontend/ui/elements/common_settings_menu_table.lua
@@ -157,14 +157,16 @@ if Device:isAndroid() then
     local isAndroid, android = pcall(require, "android")
     if not isAndroid then return end
 
-    -- keep screen on
-    common_settings.keep_screen_on = {
-        text = _("Keep screen on"),
-        checked_func = function() return G_reader_settings:isTrue("enable_android_wakelock") end,
-        callback = function() require("ui/elements/screen_android"):toggleWakelock() end,
-    }
+    -- keep screen on toggle on devices which don't need wakelocks always enabled.
+    if not android.needsWakelocks() then
+        common_settings.keep_screen_on = {
+            text = _("Keep screen on"),
+            checked_func = function() return G_reader_settings:isTrue("enable_android_wakelock") end,
+            callback = function() require("ui/elements/screen_android"):toggleWakelock() end,
+        }
+    end
 
-    -- fullscreen
+    -- fullscreen toggle on devices with compatible fullscreen methods (apis 14-16)
     if Device.firmware_rev <= 16 then
         common_settings.fullscreen = {
             text = _("Fullscreen"),
diff --git a/platform/android/luajit-launcher b/platform/android/luajit-launcher
index b6a7a10e8..825ed0fb0 160000
--- a/platform/android/luajit-launcher
+++ b/platform/android/luajit-launcher
@@ -1 +1 @@
-Subproject commit b6a7a10e8eb5bbb4ba13bd0a940a52ebb40daa63
+Subproject commit 825ed0fb08ea2e59d8163601812da1defe926aa0