Merge pull request #12346 from eeejay/bug-919024

Bug 919024 - Fix emergency dialer key order. r=etienne
Bug 918602 - Give keyboard keys 'key' role.