Merge "Remove qtaguid support on devices with bpf"