am f5960b4f: am 034a4a5a: am c4710124: Merge "Fix the order of keys on more keys keyboard" into lmp-dev

* commit 'f5960b4f621339a46cd266c5197a1dd861932741':
  Fix the order of keys on more keys keyboard