Merge branch 'master' into '123-allowMeteredConnection-eDrive'

# Conflicts:
#   app/src/main/AndroidManifest.xml
1 job for 123-allowMeteredConnection-eDrive in 1 minute and 57 seconds (queued for 6 seconds)