[keyboardlayouts] change from named layout to a locale+variant system