Merge "Remove Rhodi keylayout" into lmp-dev