Bug 1016179 - [Keyboard] Correct Promise usage and some API changes
Merge pull request #19663 from timdream/keyboard-promise-fix2

Bug 1016179 - [Keyboard] Correct Promise usage and some API changes, r=rudyl