Merge "Filter out redundant ioctl entries early"