refs #1814, #4594 Related to !8124, !8578 Port changes from !8578 authored by Aster Boese to currently developed MR for the librem5. Co-authored-by: Aster Boese asterboese@mailbox.org Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8751>