Merge "Fix the re-entrance of VpnSetting issue." into honeycomb