Merge "Display correct HID icon for pointing and misc. devices" into honeycomb