Merge "Ignore touchpad contacts that are marked as palms" into udc-dev