Merge "Replace calls for updating permission to protect sockets from VPN" into main