Merge upstream changes

2 jobs for librem5 in 4 minutes and 4 seconds