Merge "Expose vendor and product IDs for InputDevices" into klp-dev