Tofe/work: rebased keyboard with upstream Ubuntu code