diff --git a/MyTracks/src/com/google/android/apps/mytracks/AbstractSendToGoogleActivity.java b/MyTracks/src/com/google/android/apps/mytracks/AbstractSendToGoogleActivity.java
index ba5276dac..abdc7c899 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/AbstractSendToGoogleActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/AbstractSendToGoogleActivity.java
@@ -61,7 +61,8 @@ public abstract class AbstractSendToGoogleActivity extends AbstractMyTracksActiv
     implements ChooseAccountCaller, AddEmailsCaller, ChooseActivityCaller {
 
   private static final String TAG = AbstractMyTracksActivity.class.getSimpleName();
-
+  private static final String SEND_REQUEST_KEY = "send_request_key";
+  
   private SendRequest sendRequest;
 
   private PermissionCallback driveCallback = new PermissionCallback() {
@@ -118,6 +119,20 @@ public abstract class AbstractSendToGoogleActivity extends AbstractMyTracksActiv
         getSupportFragmentManager(), ChooseAccountDialogFragment.CHOOSE_ACCOUNT_DIALOG_TAG);
   }
 
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    if (savedInstanceState != null) {
+      sendRequest = savedInstanceState.getParcelable(SEND_REQUEST_KEY);
+    }
+  }
+  
+  @Override
+  protected void onSaveInstanceState(Bundle outState) {
+    super.onSaveInstanceState(outState);
+    outState.putParcelable(SEND_REQUEST_KEY, sendRequest);
+  }
+  
   @Override
   protected void onActivityResult(int requestCode, int resultCode, Intent data) {
     switch (requestCode) {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackEditActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackEditActivity.java
index 3dcf5132e..09d1b5ccf 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackEditActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackEditActivity.java
@@ -47,7 +47,7 @@ public class TrackEditActivity extends AbstractMyTracksActivity
   public static final String EXTRA_NEW_TRACK = "new_track";
 
   private static final String TAG = TrackEditActivity.class.getSimpleName();
-  private static final String ICON_VALUE = "icon_value";
+  private static final String ICON_VALUE_KEY = "icon_value_key";
 
   private Long trackId;
   private MyTracksProviderUtils myTracksProviderUtils;
@@ -115,7 +115,7 @@ public class TrackEditActivity extends AbstractMyTracksActivity
 
     iconValue = null;
     if (bundle != null) {
-      iconValue = bundle.getString(ICON_VALUE);
+      iconValue = bundle.getString(ICON_VALUE_KEY);
     }
     if (iconValue == null) {
       iconValue = track.getIcon();
@@ -164,7 +164,7 @@ public class TrackEditActivity extends AbstractMyTracksActivity
   @Override
   public void onSaveInstanceState(Bundle outState) {
     super.onSaveInstanceState(outState);
-    outState.putString(ICON_VALUE, iconValue);
+    outState.putString(ICON_VALUE_KEY, iconValue);
   }
 
   @Override