Merge "Add input device property for buttons under touchpads"