Merge branch 'main' into '143-crash-no-of-days'

# Conflicts:
#   presentation/src/main/res/values/strings.xml
1 job for 143-crash-no-of-days in 3 minutes and 55 seconds (queued for 1 second)