Respond to CR.

SignalMessaging/environment/AppSetup.m

@@ -10,6 +10,7 @@
 #import <SignalMessaging/OWSDatabaseMigration.h>
 #import <SignalMessaging/OWSProfileManager.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
+#import <SignalServiceKit/OWSBackgroundTask.h>
 #import <SignalServiceKit/OWSStorage.h>
 #import <SignalServiceKit/TextSecureKitEnv.h>
 
@@ -25,6 +26,9 @@ NS_ASSUME_NONNULL_BEGIN
 
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
+        // Order matters here.
+        [[OWSBackgroundTaskManager sharedManager] observeNotifications];
+
         [Environment setCurrent:[Release releaseEnvironment]];
 
         id<OWSCallMessageHandler> callMessageHandler = callMessageHandlerBlock();

SignalMessaging/environment/Release.m

@@ -7,7 +7,6 @@
 #import "NotificationsManager.h"
 #import "OWSContactsManager.h"
 #import <SignalServiceKit/ContactsUpdater.h>
-#import <SignalServiceKit/OWSBackgroundTask.h>
 #import <SignalServiceKit/OWSMessageSender.h>
 #import <SignalServiceKit/TSNetworkManager.h>
 
@@ -19,7 +18,6 @@
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         // Order matters here.
-        [[OWSBackgroundTaskManager sharedManager] observeNotifications];
         TSStorageManager *storageManager = [TSStorageManager sharedManager];
         TSNetworkManager *networkManager = [TSNetworkManager sharedManager];
         OWSContactsManager *contactsManager = [OWSContactsManager new];