Merge "Make firewall bpf code multi-user aware" into main