Merge "Multiple fixes related to VPN concurrency"