Merge pull request amay077#505 from amay077/issue_504

Fix NullPointerException when Page popped

Author: amay077

Diff for: XFGoogleMapSample/XFGoogleMapSample/BoundsTestPage.xaml.cs

@@ -11,12 +11,12 @@
 
 namespace XFGoogleMapSample.local
 {
-	[XamlCompilation(XamlCompilationOptions.Compile)]
-	public partial class BoundsTestPage : ContentPage
-	{
-		public BoundsTestPage ()
-		{
-			InitializeComponent ();
+    [XamlCompilation(XamlCompilationOptions.Compile)]
+    public partial class BoundsTestPage : ContentPage
+    {
+        public BoundsTestPage ()
+        {
+            InitializeComponent ();
 
             // Colosseum of Rome: 41.890251, 12.492373
             var center = new Position(41.890251, 12.492373);

Diff for: Xamarin.Forms.GoogleMaps/Xamarin.Forms.GoogleMaps.iOS/MapRenderer.cs

@@ -62,7 +62,8 @@ protected override void Dispose(bool disposing)
                         logic.Unregister(NativeMap, Map);
                     }
                 }               
-                _cameraLogic.Unregister();              
+                _cameraLogic.Unregister();
+                _uiSettingsLogic.Unregister();
 
                 var mkMapView = (MapView)Control;
                 if(mkMapView!=null)