Merge branch 'wip/sadiq/cherry-pick' into 'librem5-3-24-20'

Cherry pick some upstream touch fixes

See merge request Librem5/gtk!16
7 jobs for librem5-3-24-20 in 4 minutes and 47 seconds (queued for 7 minutes and 14 seconds)