Merge "Keyboard shortcuts: dismiss when activities start via shortcut" into nyc-dev am: 1a83df8ba7
am: 9e16d11683

* commit '9e16d116834ca4592f927f0966ead791bbfc25e6':
  Keyboard shortcuts: dismiss when activities start via shortcut

Change-Id: I635c7623b927b51b8f653423a6657af880ac30a3