Merged upstream/master.
Merged global-hotkey-focus-fix