WIP: defconfig update + uhid fixes

Change-Id: Ifd78181135e3015db28ee9af4dea7cac72a308f0