Merge "Keyboard shortcuts: new layout for keys container" into nyc-dev