diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj
index 4b28527465..4d0ed866a3 100644
--- a/packages/Avalonia/Avalonia.csproj
+++ b/packages/Avalonia/Avalonia.csproj
@@ -8,7 +8,9 @@
       <ProjectReference Include="../../src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj" />
       <ProjectReference Include="../../src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj" >
         <PrivateAssets>all</PrivateAssets>
-      </ProjectReference>  
+        <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
+        <SetTargetFramework>TargetFramework=netstandard2.0</SetTargetFramework>
+      </ProjectReference>
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/samples/ControlCatalog.Android/ControlCatalog.Android.csproj b/samples/ControlCatalog.Android/ControlCatalog.Android.csproj
index 516acfe4b9..9777bb46c3 100644
--- a/samples/ControlCatalog.Android/ControlCatalog.Android.csproj
+++ b/samples/ControlCatalog.Android/ControlCatalog.Android.csproj
@@ -21,8 +21,9 @@
 
   <PropertyGroup Condition="'$(Configuration)'=='Release' and '$(TF_BUILD)' == ''">
     <DebugSymbols>True</DebugSymbols>
-    <RunAOTCompilation>False</RunAOTCompilation>
+    <RunAOTCompilation>True</RunAOTCompilation>
     <EnableLLVM>True</EnableLLVM>
+    <AndroidEnableProfiledAot>True</AndroidEnableProfiledAot>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
index 8cb7aa1cfd..db0bb01410 100644
--- a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
+++ b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
@@ -11,12 +11,18 @@
     <MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
     <DebugType>portable</DebugType>
   </PropertyGroup>
-  
+
+  <ItemGroup>
+    <AndroidResource Include="..\..\..\build\Assets\Icon.png">
+      <Link>Resources\drawable\Icon.png</Link>
+    </AndroidResource>
+  </ItemGroup>
+
   <PropertyGroup Condition="'$(Configuration)'=='Release' and '$(TF_BUILD)' == ''">
     <DebugSymbols>True</DebugSymbols>
     <RunAOTCompilation>True</RunAOTCompilation>
     <EnableLLVM>True</EnableLLVM>
-    <!--<AndroidEnableProfiledAot>True</AndroidEnableProfiledAot>-->
+    <AndroidEnableProfiledAot>True</AndroidEnableProfiledAot>
   </PropertyGroup>
   
   <ItemGroup>
diff --git a/src/Android/Avalonia.AndroidTestApplication/MainActivity.cs b/src/Android/Avalonia.AndroidTestApplication/MainActivity.cs
index 471b982d9e..8f4beb2737 100644
--- a/src/Android/Avalonia.AndroidTestApplication/MainActivity.cs
+++ b/src/Android/Avalonia.AndroidTestApplication/MainActivity.cs
@@ -1,9 +1,10 @@
 using System;
 using Android.App;
 using Android.Content.PM;
-using Android.OS;
 using Avalonia.Android;
 using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Input.TextInput;
 using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 using Avalonia.Styling;
@@ -14,22 +15,15 @@ namespace Avalonia.AndroidTestApplication
     [Activity(Label = "Main",
         MainLauncher = true,
         Icon = "@drawable/icon",
-         Theme = "@style/Theme.AppCompat.NoActionBar",
-         ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize,
+        Theme = "@style/Theme.AppCompat.NoActionBar",
+        ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize,
         LaunchMode = LaunchMode.SingleInstance/*,
         ScreenOrientation = ScreenOrientation.Landscape*/)]
-    public class MainBaseActivity : AvaloniaActivity
+    public class MainActivity : AvaloniaActivity<App>
     {
-        protected override void OnCreate(Bundle savedInstanceState)
+        protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
         {
-            if (Avalonia.Application.Current == null)
-            {
-                AppBuilder.Configure<App>()
-                    .UseAndroid()
-                    .SetupWithoutStarting();
-            }
-            base.OnCreate(savedInstanceState);
-            Content = App.CreateSimpleWindow();
+            return base.CustomizeAppBuilder(builder);
         }
     }
 
@@ -37,13 +31,17 @@ namespace Avalonia.AndroidTestApplication
     {
         public override void Initialize()
         {
-            Styles.Add(new DefaultTheme());
-
-            var baseLight = (IStyle)AvaloniaXamlLoader.Load(
-                new Uri("resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default"));
-            Styles.Add(baseLight);
+            Styles.Add(new SimpleTheme(new Uri("avares://Avalonia.AndroidTestApplication")));
+        }
 
+        public override void OnFrameworkInitializationCompleted()
+        {
+            if (ApplicationLifetime is ISingleViewApplicationLifetime singleViewLifetime)
+            {
+                singleViewLifetime.MainView = CreateSimpleWindow();
+            }
 
+            base.OnFrameworkInitializationCompleted();
         }
 
         // This provides a simple UI tree for testing input handling, drawing, etc
@@ -76,12 +74,12 @@ namespace Avalonia.AndroidTestApplication
                             Foreground = Brushes.Black
                         },
 
-                        CreateTextBox(Input.TextInput.TextInputContentType.Normal),
-                        CreateTextBox(Input.TextInput.TextInputContentType.Password),
-                        CreateTextBox(Input.TextInput.TextInputContentType.Email),
-                        CreateTextBox(Input.TextInput.TextInputContentType.Url),
-                        CreateTextBox(Input.TextInput.TextInputContentType.Phone),
-                        CreateTextBox(Input.TextInput.TextInputContentType.Number),
+                        CreateTextBox(TextInputContentType.Normal),
+                        CreateTextBox(TextInputContentType.Password),
+                        CreateTextBox(TextInputContentType.Email),
+                        CreateTextBox(TextInputContentType.Url),
+                        CreateTextBox(TextInputContentType.Digits),
+                        CreateTextBox(TextInputContentType.Number),
                     }
                 }
             };
@@ -89,16 +87,16 @@ namespace Avalonia.AndroidTestApplication
             return window;
         }
 
-        private static TextBox CreateTextBox(Input.TextInput.TextInputContentType contentType)
+        private static TextBox CreateTextBox(TextInputContentType contentType)
         {
             var textBox = new TextBox()
             {
                 Margin = new Thickness(20, 10),
                 Watermark = contentType.ToString(),
                 BorderThickness = new Thickness(3),
-                FontSize = 20
+                FontSize = 20,
+                [TextInputOptions.ContentTypeProperty] = contentType
             };
-            textBox.TextInputOptionsQuery += (s, e) => { e.ContentType = contentType; };
 
             return textBox;
         }
diff --git a/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj b/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj
index b796e173c4..d7f39f6642 100644
--- a/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj
+++ b/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj
@@ -10,6 +10,8 @@
     <ProjectReference Include="..\Avalonia.Build.Tasks\Avalonia.Build.Tasks.csproj">
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <ExcludeAssets>all</ExcludeAssets>
+      <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
+      <SetTargetFramework>TargetFramework=netstandard2.0</SetTargetFramework>
     </ProjectReference>
   </ItemGroup>
   <Import Project="..\..\build\BuildTargets.targets" />