Merge "Fix code for NPE when click add and cancel repeatly VPN profile"