diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/MainApplication.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/MainApplication.cs
new file mode 100644
index 000000000..770fedc82
--- /dev/null
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/MainApplication.cs
@@ -0,0 +1,63 @@
+using System;
+
+using Android.App;
+using Android.OS;
+using Android.Runtime;
+using Plugin.CurrentActivity;
+
+namespace eShopOnContainers.TestRunner.Droid
+{
+ //You can specify additional application information in this attribute
+ [Application]
+ public class MainApplication : Application, Application.IActivityLifecycleCallbacks
+ {
+ public MainApplication(IntPtr handle, JniHandleOwnership transer)
+ :base(handle, transer)
+ {
+ }
+
+ public override void OnCreate()
+ {
+ base.OnCreate();
+ RegisterActivityLifecycleCallbacks(this);
+ //A great place to initialize Xamarin.Insights and Dependency Services!
+ }
+
+ public override void OnTerminate()
+ {
+ base.OnTerminate();
+ UnregisterActivityLifecycleCallbacks(this);
+ }
+
+ public void OnActivityCreated(Activity activity, Bundle savedInstanceState)
+ {
+ CrossCurrentActivity.Current.Activity = activity;
+ }
+
+ public void OnActivityDestroyed(Activity activity)
+ {
+ }
+
+ public void OnActivityPaused(Activity activity)
+ {
+ }
+
+ public void OnActivityResumed(Activity activity)
+ {
+ CrossCurrentActivity.Current.Activity = activity;
+ }
+
+ public void OnActivitySaveInstanceState(Activity activity, Bundle outState)
+ {
+ }
+
+ public void OnActivityStarted(Activity activity)
+ {
+ CrossCurrentActivity.Current.Activity = activity;
+ }
+
+ public void OnActivityStopped(Activity activity)
+ {
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj
index f1867bb67..527ff23f4 100755
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj
@@ -51,6 +51,21 @@
+
+ ..\..\..\..\packages\Plugin.CurrentActivity.1.0.1\lib\MonoAndroid10\Plugin.CurrentActivity.dll
+
+
+ ..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\MonoAndroid10\Plugin.Geolocator.dll
+
+
+ ..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\MonoAndroid10\Plugin.Geolocator.Abstractions.dll
+
+
+ ..\..\..\..\packages\Plugin.Permissions.1.1.7\lib\MonoAndroid10\Plugin.Permissions.dll
+
+
+ ..\..\..\..\packages\Plugin.Permissions.1.1.7\lib\MonoAndroid10\Plugin.Permissions.Abstractions.dll
+
@@ -194,12 +209,15 @@
+
-
+
+ Designer
+
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/packages.config b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/packages.config
index 8262c106d..c2eacca73 100755
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/packages.config
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/packages.config
@@ -13,6 +13,8 @@
+
+
@@ -58,6 +60,7 @@
+