Include missing deps from xenial

The xenial branch still had some commits of interest missing for focal so cherry-pick them over (with lomiri rename on the keyboard commit).

See also the fourth problem reported on ubports/porting/reference-device-ports/android11/volla-phone-22/volla-mimameid#7 (closed).