undo rollback change

Author: geof90

android/app/src/main/java/com/microsoft/codepush/react/CodePush.java

@@ -41,7 +41,6 @@
 
 public class CodePush {
 
-    private static int rollbackTimeout = 0;
     private boolean resumablePendingUpdateAvailable = false;
     private boolean didUpdate = false;
     private Timer timer;
@@ -89,11 +88,6 @@ public CodePush(String deploymentKey, Activity mainActivity) {
         }
 
         checkForPendingUpdate(/*needsRestart*/ false);
-
-        if (0 != rollbackTimeout) {
-            startRollbackTimer(rollbackTimeout);
-            rollbackTimeout = 0;
-        }
     }
 
     public ReactPackage getReactPackage() {
@@ -191,7 +185,9 @@ private void initializeUpdateWithRollbackTimeout(int rollbackTimeout, boolean ne
             codePushNativeModule.loadBundle();
         }
 
-        CodePush.rollbackTimeout = rollbackTimeout;
+        if (0 != rollbackTimeout) {
+            startRollbackTimer(rollbackTimeout);
+        }
     }
 
     private boolean isFailedHash(String packageHash) {
@@ -286,7 +282,7 @@ private class CodePushNativeModule extends ReactContextBaseJavaModule {
         private void loadBundle() {
             Intent intent = mainActivity.getIntent();
             mainActivity.finish();
-            applicationContext.startActivity(intent);
+            mainActivity.startActivity(intent);
         }
 
         @ReactMethod