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

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

Change-Id: I2c67fd4c393565a19af9e6fd9c9cce06a3edcd51