Fix consume_shortcut calls not checking for focus#298

DHowett merged 2 commits into

mainmicrosoft/edit:mainfrom

users/lhecker/202-shortcut-focusmicrosoft/edit:users/lhecker/202-shortcut-focusCopy head branch name to clipboard