Merge remote-tracking branch 'origin/1245-push-support-unifiedpush-connector-3x' into 1245-push-support-unifiedpush-connector-3x

# Conflicts:
#	app/src/main/kotlin/at/bitfire/davdroid/push/PushRegistrationManager.kt

Author: rfc2822