Merge "Fix support for simultaneous VPN tuns" into klp-dev