Merge "move the bpf.progs_loaded = 1 setting back to bpfloader" into main