Merge branch 'master' of https://github.com/Psiphon-Labs/psiphon-tunnel-core into staging-client

MobileLibrary/Android/PsiphonTunnel/PsiphonTunnel.java

@@ -498,7 +498,7 @@ public class PsiphonTunnel extends Psi.PsiphonProvider.Stub {
                 JSONObject data = notice.getJSONObject("data");
                 mHostService.onClientVerificationRequired(data.getString("nonce"), data.getInt("ttlSeconds"), data.getBoolean("resetCache"));
             } else if (noticeType.equals("ActiveTunnel")) {
-                if (isVPNMode()) {
+                if (isVpnMode()) {
                     if (notice.getJSONObject("data").getBoolean("isTCS")) {
                       disableUdpGwKeepalive();
                     } else {