v2.6.9: Merge branch 'main' of https://github.com/solidos/contacts-pane into …

…main