Merge pull request #13462 from timdream/keyboard-callback-error

Bug 935868 - check for callback(), r=rudyl