Merge branch 'master' into '1142-wakeful-tasks'
# Conflicts: # bramble-android/src/main/java/org/briarproject/bramble/system/AndroidTaskScheduler.java
# Conflicts: # bramble-android/src/main/java/org/briarproject/bramble/system/AndroidTaskScheduler.java