Code review comments

Author: amosekr

Trimble.Modus.Components/Controls/Toast/TMToastContents.xaml.cs

@@ -155,19 +155,18 @@ private void SetTheme(String toastTheme)
         UpdateIconColor();
 
     }
-
-    bool isPopupClosed = false;
+
     private void CloseButtonClicked(object sender, EventArgs e)
-    {        
-        PopupService.Instance.RemovePageAsync(this, true);
-        isPopupClosed = true;
+    {
+        if (PopupService.Instance.PopupStack.Contains(this))
+            PopupService.Instance.RemovePageAsync(this, true);
     }
     public void CloseAfterDelay()
     {
         Task.Run(async () =>
         {
             await Task.Delay(DELAYTIME);
-            if (!isPopupClosed)
+            if (PopupService.Instance.PopupStack.Contains(this))
                 await PopupService.Instance.RemovePageAsync(this, true);
         });
     }