diff --git a/src/LibRyujinx/LibRyujinx.cs b/src/LibRyujinx/LibRyujinx.cs
index 484580c93..dd5278891 100644
--- a/src/LibRyujinx/LibRyujinx.cs
+++ b/src/LibRyujinx/LibRyujinx.cs
@@ -35,6 +35,7 @@ using Ryujinx.Common.Logging.Targets;
 using System.Collections.Generic;
 using System.Text;
 using Ryujinx.HLE.UI;
+using LibRyujinx.Android;
 
 namespace LibRyujinx
 {
@@ -657,6 +658,38 @@ namespace LibRyujinx
 
             return paths;
         }
+
+        public static void SetupUiHandler()
+        {
+            if (SwitchDevice is { } switchDevice)
+            {
+                switchDevice.HostUiHandler = new AndroidUiHandler();
+            }
+        }
+
+        public static void WaitUiHandler()
+        {
+            if (SwitchDevice?.HostUiHandler is AndroidUiHandler uiHandler)
+            {
+                uiHandler.Wait();
+            }
+        }
+
+        public static void StopUiHandlerWait()
+        {
+            if (SwitchDevice?.HostUiHandler is AndroidUiHandler uiHandler)
+            {
+                uiHandler.Set();
+            }
+        }
+
+        public static void SetUiHandlerResponse(bool isOkPressed, long input)
+        {
+            if (SwitchDevice?.HostUiHandler is AndroidUiHandler uiHandler)
+            {
+                uiHandler.SetResponse(isOkPressed, input);
+            }
+        }
     }
 
     public class SwitchDevice : IDisposable
diff --git a/src/LibRyujinx/LibRyujinx.csproj b/src/LibRyujinx/LibRyujinx.csproj
index d8fa6ef7d..2b961083f 100644
--- a/src/LibRyujinx/LibRyujinx.csproj
+++ b/src/LibRyujinx/LibRyujinx.csproj
@@ -12,6 +12,7 @@
     <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
     <InvariantGlobalization>true</InvariantGlobalization>
     <SuppressTrimAnalysisWarnings>false</SuppressTrimAnalysisWarnings>
+    <IlcInstructionSet>armv8.2-a</IlcInstructionSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
     <Optimize>true</Optimize>