Merge "Fix bug #5846413 "phone" keyboard layout is broken on master"