Incorporated recommended changes from...

Incorporated recommended changes from tails/tails#17882 (comment 161104)
6 jobs for !289 with doc/17882-contextual-identities in 0 seconds (queued for 115 minutes and 1 second)
latest merge request