Merge main into branch, resolve CHANGELOG conflict

Co-authored-by: VegardHV <71251242+VegardHV@users.noreply.github.com>

Author: Copilot

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## [55.6.9]
 - [Android][Camera] Moved shutter animation from shutter button press to when the image capture has started
 - [Android][Camera] Added a hint to keep the camera still for devices that don't support Zero-Shutter-Lag
+- [SortControlBottomSheet] Fix memory leak.
 
 ## [55.6.8]
 - [Shell] Fixed memory leak when Shell items change where child component handlers were not disconnected on iOS, and neither page nor child handlers were disconnected on Android

src/library/DIPS.Mobile.UI/Components/Sorting/SortControlBottomSheet.cs

@@ -19,7 +19,7 @@ namespace DIPS.Mobile.UI.Components.Sorting;
 
 internal class SortControlBottomSheet : BottomSheet
 {
-    private readonly SortControl m_sortControl;
+    private SortControl m_sortControl;
 
     private readonly CollectionView m_collectionView = new() { ItemSpacing = Sizes.GetSize(SizeName.size_0)};
 
@@ -115,7 +115,16 @@ private object LoadTemplate()
         return radioButtonListItem;
     }
 
-    
+
+    protected override void OnHandlerChanged()
+    {
+        base.OnHandlerChanged();
+
+        if (Handler is null)
+        {
+            m_sortControl = null;
+        }
+    }
 }
 internal class SortElementHintConverter : IValueConverter
 {