Merge branch 'master' into '1142-wakeful-tasks'

# Conflicts:
#   bramble-android/src/main/java/org/briarproject/bramble/system/AndroidTaskScheduler.java
1 job for 1142-wakeful-tasks in 8 minutes and 49 seconds (queued for 7 minutes and 16 seconds)
Status Job ID Name Coverage
  Test
passed test #5682

00:08:49