Merge branch 'develop'

Author: michaelstonis

Stellar.Maui/Extensions/PickerExtensions.cs

@@ -417,6 +417,12 @@ private void SetSelectedItem(bool fromNotificationTrigger = false)
         }
 
         var picker = _picker;
+
+        if ((_picker?.SelectedIndex ?? -1) < 0)
+        {
+            return;
+        }
+
         picker?.Dispatcher?.Dispatch(() => picker.ResetToInitialValue());
 
         if (fromNotificationTrigger)
@@ -444,14 +450,18 @@ private void SelectedItemChanged(TViewModel? item, bool fromUi = false)
             return;
         }
 
-        picker.Dispatcher?.Dispatch(() => _selectedItemChanged?.Invoke(item));
+        picker.Dispatcher?.Dispatch(
+            () =>
+            {
+                _selectedItemChanged?.Invoke(item);
 
-        if (fromUi || (_picker.SelectedItem is not null && EqualityComparer<TViewModel>.Default.Equals(item, this.SelectedItem)))
-        {
-            return;
-        }
+                if (fromUi || (picker.SelectedItem is not null && EqualityComparer<TViewModel>.Default.Equals(item, this.SelectedItem)))
+                {
+                    return;
+                }
 
-        picker.Dispatcher?.Dispatch(() => picker.SelectedItem = item);
+                picker.SelectedItem = item;
+            });
     }
 
     public void Dispose()