Suppress gtasks sync during sync migration, don't ever let the contact user be selected

astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java

@@ -427,6 +427,8 @@ public class EditPeopleControlSet extends PopupControlSet {
             for (int i = 0; i < userList.size(); i++) {
                 JSONObject user = userList.get(i).user;
                 if (user != null) {
+                    if (user.optBoolean(CONTACT_CHOOSER_USER))
+                        continue;
                     if (getLongOrStringId(user, Task.USER_ID_EMAIL).equals(assignedId) ||
                             (user.optString("email").equals(assignedEmail) &&
                                     !(TextUtils.isEmpty(assignedEmail))))

astrid/plugin-src/com/todoroo/astrid/actfm/sync/AstridNewSyncMigrator.java

@@ -226,6 +226,7 @@ public class AstridNewSyncMigrator {
                             recurrence = recurrence + fromCompletion;
                         template.setValue(Task.RECURRENCE, recurrence);
 
+                        template.putTransitory(SyncFlags.GTASKS_SUPPRESS_SYNC, true);
                         taskDao.saveExisting(template);
                     }
                 } catch (Exception e) {
@@ -559,6 +560,7 @@ public class AstridNewSyncMigrator {
                     }
 
                     instance.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true);
+                    instance.putTransitory(SyncFlags.GTASKS_SUPPRESS_SYNC, true);
                     dao.saveExisting(instance);
                     boolean createdOutstanding = false;
                     if (propertiesForOutstanding != null && (unsyncedModel || (extras != null && extras.shouldCreateOutstandingEntries(instance)))) {