Merge branch 'tm-merge-v11' into 'master'

Merged upstream Tusky v11

See merge request !8
2 jobs for master in 13 minutes and 22 seconds (queued for 1 minute)
Status Job ID Name Coverage
  Test
passed #291096
android
test

00:04:47

 
  Build
passed #291097
android
build

00:08:34