Merge branch 'rel-0.6.9' into 'librem5'

This prepares a new releases cleaning things up as good as possible

See merge request !7