Keyboard settings: last changes before upstream merge