Merge "Prevent crash in VPN settings Bug #5217245"