Merge "Fix libinput warnings"