MERGE these: Some bugfixes - the buildsystem is acting up again See merge request Librem5/squeekboard!53