Merge "Add a flag to disable the background firewall chain" into main