diff --git a/src/android/app/build.gradle b/src/android/app/build.gradle
index c3cb144e963..17566833d1d 100644
--- a/src/android/app/build.gradle
+++ b/src/android/app/build.gradle
@@ -53,7 +53,7 @@ android {
         }
     }
 
-    ndkVersion = '26.0.10792818'
+    ndkVersion = '26.1.10909125'
     lint {
         abortOnError false
     }
diff --git a/src/android/app/src/main/assets/3dstdb-zh_CN.txt b/src/android/app/src/main/assets/3dstdb-zh_CN.txt
index d6903b20aac..f006a8fcf40 100644
--- a/src/android/app/src/main/assets/3dstdb-zh_CN.txt
+++ b/src/android/app/src/main/assets/3dstdb-zh_CN.txt
@@ -173,6 +173,9 @@
 0004000000034F00 = 死或生 多重维度
 0004000000038A00 = 死或生 多重维度
 00040000000CF500 = 勇者斗恶龙怪兽篇2
+00040000001C3A00 = 勇者斗恶龙1
+00040000001C3800 = 勇者斗恶龙2
+00040000001C3900 = 勇者斗恶龙3
 000400000018F100 = 勇者斗恶龙8
 000400000018F200 = 勇者斗恶龙8
 000400000015CD00 = 勇者斗恶龙8
diff --git a/src/android/app/src/main/assets/config/config-games.ini b/src/android/app/src/main/assets/config/config-games.ini
index 3b089c697d8..959f6c0d360 100644
--- a/src/android/app/src/main/assets/config/config-games.ini
+++ b/src/android/app/src/main/assets/config/config-games.ini
@@ -241,17 +241,6 @@
 0004000000187E00 // Picross 2
 0004000000169A00 // Picross 2
 
-[disable_direct_display]
-00040000001B5000 // Pokemon Ultra Sun
-00040000001B5100 // Pokemon Ultra Moon
-0004000000164800 // Pokemon Sun
-0004000000175E00 // Pokemon Moon
-00040000001AA900 // Dragon Ball Fusions
-00040000001AAA00 // Dragon Ball Fusions
-0004000000196D00 // Dragon Ball Fusions
-0004000000132000 // Ultimate NES Remix
-0004000000132100 // Ultimate NES Remix
-
 [skip_cpu_write]
 0004000000120900 // Lord of Magna: Maiden Heaven
 0004000000164300 // Lord of Magna: Maiden Heaven
@@ -264,8 +253,8 @@
 000400000016CE00 // Metroid Prime: Federation Force
 000400000016E300 // Metroid Prime: Federation Force
 
-[disable_hw_shader]
-0004000000187500 // Creeping Terror
+[hw_shader_limit]
+0004000000187500,512 // Creeping Terror
 
 [use_separable_shader]
 
diff --git a/src/android/app/src/main/java/org/citra/emu/settings/SettingsFile.java b/src/android/app/src/main/java/org/citra/emu/settings/SettingsFile.java
index 6a2a016d86d..e673667541d 100644
--- a/src/android/app/src/main/java/org/citra/emu/settings/SettingsFile.java
+++ b/src/android/app/src/main/java/org/citra/emu/settings/SettingsFile.java
@@ -24,6 +24,7 @@ public final class SettingsFile {
     // Core
     public static final String KEY_USE_CPU_JIT = "use_cpu_jit";
     public static final String KEY_IS_NEW_3DS = "is_new_3ds";
+    public static final String KEY_USE_GAME_CONFIG = "use_game_config";
     public static final String KEY_SYSTEM_REGION = "region_value";
     public static final String KEY_SYSTEM_LANGUAGE = "language";
     public static final String KEY_SHARED_FONT_TYPE = "shared_font_type";
diff --git a/src/android/app/src/main/java/org/citra/emu/settings/SettingsFragment.java b/src/android/app/src/main/java/org/citra/emu/settings/SettingsFragment.java
index 03d821f556c..b2ed7b094ef 100644
--- a/src/android/app/src/main/java/org/citra/emu/settings/SettingsFragment.java
+++ b/src/android/app/src/main/java/org/citra/emu/settings/SettingsFragment.java
@@ -191,9 +191,13 @@ private ArrayList<SettingsItem> loadSettingsList() {
         Setting cpuJIT = coreSection.getSetting(SettingsFile.KEY_USE_CPU_JIT);
         Setting language = coreSection.getSetting(SettingsFile.KEY_SYSTEM_LANGUAGE);
         Setting font = coreSection.getSetting(SettingsFile.KEY_SHARED_FONT_TYPE);
-
         Setting theme = coreSection.getSetting(SettingsFile.KEY_THEME_PACKAGE);
 
+        if (mGameID.isEmpty()) {
+            Setting useGameConfig = coreSection.getSetting(SettingsFile.KEY_USE_GAME_CONFIG);
+            sl.add(new CheckBoxSetting(SettingsFile.KEY_USE_GAME_CONFIG, Settings.SECTION_INI_CORE,
+                    R.string.setting_use_game_config, R.string.setting_use_game_config_desc, false, useGameConfig));
+        }
         sl.add(new CheckBoxSetting(SettingsFile.KEY_IS_NEW_3DS, Settings.SECTION_INI_CORE,
                 R.string.setting_is_new_3ds, R.string.setting_is_new_3ds_desc, false, isNew3DS));
         sl.add(new CheckBoxSetting(SettingsFile.KEY_USE_CPU_JIT, Settings.SECTION_INI_CORE,
diff --git a/src/android/app/src/main/res/values-es/strings.xml b/src/android/app/src/main/res/values-es/strings.xml
index f85e80fb637..ae24d312c94 100644
--- a/src/android/app/src/main/res/values-es/strings.xml
+++ b/src/android/app/src/main/res/values-es/strings.xml
@@ -164,6 +164,8 @@
     <string name="setting_header_audio">Audio</string>
     <string name="setting_header_camera">Cámara</string>
 
+    <string name="setting_use_game_config">Enable Per-Game Settings</string>
+    <string name="setting_use_game_config_desc">Game independent settings will be saved in directory: citra-emu/load/configs/.</string>
     <string name="setting_is_new_3ds">Modo New 3DS</string>
     <string name="setting_is_new_3ds_desc">El New 3DS tiene una memoria y un procesador diferentes, y algunos juegos solo pueden iniciarse en el New 3DS.</string>
     <string name="setting_use_virtual_sd">Usar SD virtual</string>
diff --git a/src/android/app/src/main/res/values-ru/strings.xml b/src/android/app/src/main/res/values-ru/strings.xml
index 0e0cba04864..f5b9f34fea5 100644
--- a/src/android/app/src/main/res/values-ru/strings.xml
+++ b/src/android/app/src/main/res/values-ru/strings.xml
@@ -164,6 +164,8 @@
     <string name="setting_header_audio">Аудио</string>
     <string name="setting_header_camera">Камера</string>
 
+    <string name="setting_use_game_config">Enable Per-Game Settings</string>
+    <string name="setting_use_game_config_desc">Game independent settings will be saved in directory: citra-emu/load/configs/.</string>
     <string name="setting_is_new_3ds">Режим обновлённой 3DS</string>
     <string name="setting_is_new_3ds_desc">Новая версия 3DS имеет другую память и процессор и некоторые игры поддерживаются только на ней.</string>
     <string name="setting_use_virtual_sd">Исп. виртуальную SD-карту</string>
diff --git a/src/android/app/src/main/res/values-zh/strings.xml b/src/android/app/src/main/res/values-zh/strings.xml
index 762cb876b6d..4f5772106bf 100644
--- a/src/android/app/src/main/res/values-zh/strings.xml
+++ b/src/android/app/src/main/res/values-zh/strings.xml
@@ -164,8 +164,10 @@
     <string name="setting_header_audio">声音设置</string>
     <string name="setting_header_camera">摄像头设置</string>
 
+    <string name="setting_use_game_config">启用游戏独立设置</string>
+    <string name="setting_use_game_config_desc">游戏的独立设置保存在以下目录：citra-emu/load/configs。</string>
     <string name="setting_is_new_3ds">New 3DS Mode</string>
-    <string name="setting_is_new_3ds_desc">新 3DS 的内存和处理器不一样，少数游戏只能在新 3DS 上才能启动。</string>
+    <string name="setting_is_new_3ds_desc">新 3DS 模式需要更好的处理器性能，占用更多的内存，少数游戏只能在新 3DS 上才能启动。</string>
     <string name="setting_use_virtual_sd">使用虚拟SD卡</string>
     <string name="setting_enable_cpu_jit">开启 CPU JIT</string>
     <string name="setting_region_value">模拟地区</string>
diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml
index 2d1b147854d..d16410b0c77 100644
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@@ -25,7 +25,10 @@
     <string name="copy_success">Copy Success!</string>
     <string name="keyboard_please_input">Please Input:</string>
     <string name="input_text_max_length">Max input length: %1$d.</string>
-    <string name="text_amiibo_hint">The amiibo directory is empty!</string>
+    <string name="text_amiibo">Amiibo</string>
+    <string name="text_load_amiibo">Load</string>
+    <string name="text_remove_amiibo">Remove</string>
+    <string name="text_amiibo_hint">The amiibo directory is empty! (citra-emu/amiibo)</string>
     <string name="main_choose_directory">Choose directory</string>
 
     <string name="setting_core_ticks_hack">FMV Hack</string>
@@ -161,6 +164,8 @@
     <string name="setting_header_audio">Audio</string>
     <string name="setting_header_camera">Camera</string>
 
+    <string name="setting_use_game_config">Enable Per-Game Settings</string>
+    <string name="setting_use_game_config_desc">Game independent settings will be saved in directory: citra-emu/load/configs/.</string>
     <string name="setting_is_new_3ds">New 3DS Mode</string>
     <string name="setting_is_new_3ds_desc">The New 3DS has different memory and processor, and some games can only start on the New 3DS.</string>
     <string name="setting_use_virtual_sd">Use Virtual SD</string>
diff --git a/src/android/build.gradle b/src/android/build.gradle
index 7925983e29b..ce656263f89 100644
--- a/src/android/build.gradle
+++ b/src/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.2'
+        classpath 'com.android.tools.build:gradle:8.2.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/src/android/gradle/wrapper/gradle-wrapper.properties b/src/android/gradle/wrapper/gradle-wrapper.properties
index 34688771ccf..cdf1bc68909 100644
--- a/src/android/gradle/wrapper/gradle-wrapper.properties
+++ b/src/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip