I agree that converging will take more time than just a quick fix, we should definitely merge this for now and then see what we can unify.
My main question would be whether desktop should indeed be the only form factor for the non-mobile KCM. Right now, kcm_mobile claims the handset, tablet and mediacenter form factors. handset is obvious, mediacentershould also rather stick with the simpler one,tablet` I'm not sure about though.
It seems like tablet could go either way. I'm also not quite sure what criteria System Settings is using to determine when tablet gets set as form factor.