You can merge this bug with #364229. I ran setxkbmap from that directory and the layout is working all right. Thanks.