Pull remove-hotkey into release branch