Merge "Keyboard shortcuts: minor type change" into nyc-dev