[2025.05.2001] Post-release merge (#5455)

The release train Release with version 2025.05.2001 has finished.
The r/release/2025-05-20 branch has to be merged into master branch.

---------

Co-authored-by: Sasikanth <[email protected]>
Co-authored-by: Siddharth Agarwal <[email protected]>
Co-authored-by: sagarwal <[email protected]>

Author: 4 people

CHANGELOG.md

@@ -6,7 +6,6 @@
 
 - Handle window insets when displaying app content in edge-to-edge
 - Enable edge-to-edge support on all versions of Android
-- Handle nullable inputs when removing last chip in the `ChipInputAutoCompleteTextView`
 - Migrate `PatientSummaryScreen` toolbar to Jetpack Compose
 - Add Compose components for Overdue screen
 - Migrate medicines summary view to Jetpack Compose
@@ -15,11 +14,6 @@
 - Migrate blood pressure summary view to Jetpack Compose
 - Migrate blood sugar summary view to Jetpack Compose
 - Migrate medical history summary view to Jetpack Compose
-- Replace `traceur` library with `rxjava3-extension`
-
-### Fixes
-
-- Fix app crashing when opening un-synced teleconsult request
 
 ## 2025.05.20
 
@@ -49,6 +43,8 @@
 - Update manifest payload to move countries to top level and add version field
 - Bump Open CSV to v5.11
 - Update lab based statin translations for `si-LK`, `ta-LK`
+- Handle nullable inputs when removing last chip in the `ChipInputAutoCompleteTextView`
+- Replace `traceur` library with `rxjava3-extension`
 
 ### Features
 
@@ -62,6 +58,7 @@
 
 - Fix crash when displaying large statin risk percentage text
 - Fix visibility for static statin nudge
+- Fix app crashing when opening un-synced teleconsult request
 
 ## 2025.04.07