am 22cfd047: Merge "Fix bug #5846413 "phone" keyboard layout is broken on master"

* commit '22cfd047abb09929331ce2727499a24bcbb3604b':
  Fix bug #5846413 "phone" keyboard layout is broken on master