Fix possible crash with CDSv2 compat.

app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryRefreshV2.kt

@@ -208,6 +208,7 @@ object ContactDiscoveryRefreshV2 {
   @WorkerThread
   private fun Set<RecipientId>.removeRegisteredButUnlisted(): Set<RecipientId> {
     val futures: List<Future<Pair<RecipientId, Boolean?>>> = Recipient.resolvedList(this)
+      .filter { it.hasServiceId() }
       .filter { hasCommunicatedWith(it) }
       .map {
         SignalExecutors.UNBOUNDED.submit(

app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java

@@ -103,7 +103,7 @@ public final class FeatureFlags {
   private static final String RECIPIENT_MERGE_V2                = "android.recipientMergeV2";
   private static final String CDS_V2_LOAD_TEST                  = "android.cdsV2LoadTest";
   private static final String SMS_EXPORTER                      = "android.sms.exporter";
-  private static final String CDS_V2_COMPAT                     = "android.cdsV2Compat";
+  private static final String CDS_V2_COMPAT                     = "android.cdsV2Compat.2";
 
   /**
    * We will only store remote values for flags in this set. If you want a flag to be controllable