diff --git a/UI/BaseScreens.cpp b/UI/BaseScreens.cpp
index b7bc505624..f375c9062a 100644
--- a/UI/BaseScreens.cpp
+++ b/UI/BaseScreens.cpp
@@ -1,10 +1,6 @@
 #include "UI/BaseScreens.h"
 #include "Core/Config.h"
 
-ViewLayoutMode UIBaseScreen::LayoutMode() const {
-	return ViewLayoutMode::IgnoreBottomInset;
-}
-
 bool UIBaseScreen::UseImmersiveMode() const {
 	DisplayLayoutConfig &config = g_Config.GetDisplayLayoutConfig(GetDeviceOrientation());
 	bool portrait = GetDeviceOrientation() == DeviceOrientation::Portrait;
diff --git a/UI/BaseScreens.h b/UI/BaseScreens.h
index f185b574be..cb8d1e0918 100644
--- a/UI/BaseScreens.h
+++ b/UI/BaseScreens.h
@@ -8,7 +8,9 @@
 class UIBaseScreen : public UIScreen {
 public:
 	UIBaseScreen() : UIScreen() {}
-	ViewLayoutMode LayoutMode() const override;
+	ViewLayoutMode LayoutMode() const override {
+		return ViewLayoutMode::IgnoreBottomInset;
+	}
 	bool UseImmersiveMode() const override;
 protected:
 	void sendMessage(UIMessage message, const char *value) override;
diff --git a/UI/SavedataScreen.h b/UI/SavedataScreen.h
index df519835c6..c9fe37effe 100644
--- a/UI/SavedataScreen.h
+++ b/UI/SavedataScreen.h
@@ -95,6 +95,10 @@ public:
 	void dialogFinished(const Screen *dialog, DialogResult result) override;
 	void sendMessage(UIMessage message, const char *value) override;
 
+	ViewLayoutMode LayoutMode() const override {
+		return ViewLayoutMode::ApplyInsets;
+	}
+
 	const char *tag() const override { return "Savedata"; }
 
 protected:
diff --git a/UI/SimpleDialogScreen.cpp b/UI/SimpleDialogScreen.cpp
index 1453a92b29..d3867598dd 100644
--- a/UI/SimpleDialogScreen.cpp
+++ b/UI/SimpleDialogScreen.cpp
@@ -46,7 +46,7 @@ void UISimpleBaseDialogScreen::CreateViews() {
 ViewLayoutMode UITwoPaneBaseDialogScreen::LayoutMode() const {
 	const bool portrait = GetDeviceOrientation() == DeviceOrientation::Portrait;
 	if (portrait) {
-		if (((flags_ & TwoPaneFlags::SettingsCanScroll) && !(flags_ & TwoPaneFlags::SettingsToTheRight)) || (flags_ & TwoPaneFlags::ContentsCanScroll)) {
+		if ((flags_ & TwoPaneFlags::SettingsCanScroll) && !(flags_ & TwoPaneFlags::SettingsToTheRight)) {
 			return ViewLayoutMode::IgnoreBottomInset;
 		} else {
 			return ViewLayoutMode::ApplyInsets;
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index 566db43f43..4ddb43ce00 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -149,6 +149,7 @@ android {
 		getByName("release") {
 			isMinifyEnabled = false
 			if (project.hasProperty("RELEASE_STORE_FILE")) {
+				println("RELEASE_STORE_FILE is set. Using as signing config.")
 				signingConfig = signingConfigs.getByName("release")
 			} else {
 				println("WARNING: RELEASE_STORE_FILE is missing. Release builds will be unusable.")