Merge branch 'master' into '1636-compression-failure'

# Conflicts:
#   bramble-android/src/main/java/org/briarproject/bramble/util/AndroidUtils.java
1 job for 1636-compression-failure in 21 minutes and 18 seconds (queued for 18 minutes and 17 seconds)