Rebase of https://source.puri.sm/dorota.czaplejewicz/squeekboard/merge_requests/3/diffs?commit_id=42f3f33233ac1507dfc3556cff3b5e6dced8d6b2