Merged in keyboard/mouse focus updates