Merge "Fix VPN retry timer mechanism"