PLA-833 fixes for keyboard event handling