Merge "InputDevice.hasKeys also checks for key usage" into udc-dev