Fixed and improvment to keyborad/devices manager before move to 2.2 then 3.0