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