diff --git a/src/Mono.Android/Test/Resources/layout/Main.axml b/src/Mono.Android/Test/Resources/layout/Main.axml
index 1d5b73ce539..5b279066483 100644
--- a/src/Mono.Android/Test/Resources/layout/Main.axml
+++ b/src/Mono.Android/Test/Resources/layout/Main.axml
@@ -17,6 +17,12 @@
       android:layout_height="wrap_content"
       android:editable="false"
   />
+  <EditText
+      android:id="@+id/edit_text"
+      android:layout_weight="1"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+  />
   <ScrollView
       android:id="@+id/my_scroll_view"
       android:layout_width="fill_parent"
diff --git a/src/Mono.Android/Test/Xamarin.Android.RuntimeTests/MainActivity.cs b/src/Mono.Android/Test/Xamarin.Android.RuntimeTests/MainActivity.cs
index cff014745e1..9bfe8087a5d 100644
--- a/src/Mono.Android/Test/Xamarin.Android.RuntimeTests/MainActivity.cs
+++ b/src/Mono.Android/Test/Xamarin.Android.RuntimeTests/MainActivity.cs
@@ -34,6 +34,9 @@ protected override void OnCreate (Bundle bundle)
 				// ignore
 			};
 
+			// test https://github.com/xamarin/xamarin-android/issues/3263
+			edit_text.TextChanged += delegate { };
+
 			csharp_simple_fragment.AllowEnterTransitionOverlap = true;
 			csharp_partial_assembly.AllowEnterTransitionOverlap = true;
 			csharp_full_assembly.AllowEnterTransitionOverlap = true;
diff --git a/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/MarkJavaObjects.cs b/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/MarkJavaObjects.cs
index 98c4ed3d203..bcc981145a4 100644
--- a/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/MarkJavaObjects.cs
+++ b/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/MarkJavaObjects.cs
@@ -192,6 +192,8 @@ void PreserveInvoker (TypeDefinition type)
 			if (invoker == null)
 				return;
 
+			Annotations.Mark (invoker);
+
 			PreserveIntPtrConstructor (invoker);
 			PreserveInterfaceMethods (type, invoker);
 		}
diff --git a/tests/Runtime-MultiDex/Resources/layout/Main.axml b/tests/Runtime-MultiDex/Resources/layout/Main.axml
index 1d5b73ce539..5b279066483 100644
--- a/tests/Runtime-MultiDex/Resources/layout/Main.axml
+++ b/tests/Runtime-MultiDex/Resources/layout/Main.axml
@@ -17,6 +17,12 @@
       android:layout_height="wrap_content"
       android:editable="false"
   />
+  <EditText
+      android:id="@+id/edit_text"
+      android:layout_weight="1"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+  />
   <ScrollView
       android:id="@+id/my_scroll_view"
       android:layout_width="fill_parent"