Merge "Keyboard shortcuts: dismiss when activities start via shortcut" into nyc-dev