`XKBMapperRegistrar` should extend `XKBMapper`

[tarek-y-ismail]

XKBMapperRegistrar is mostly duplicated from XKBMapper, except for the LED tracking code bolted on top. I had a stab at merging the two, but it wasn't as easy as I'd hoped.