Merge "Clear VPN after Clear credentials if VPN is being established"