uhid: backport from 3.4