Merge branch 'mkirk/fix-2fa-registration-layout' into release/2.22.0

Signal/src/ViewControllers/OWS2FARegistrationViewController.m

@@ -74,7 +74,10 @@ NS_ASSUME_NONNULL_BEGIN
         @"REGISTER_2FA_INSTRUCTIONS", @"Instructions to enter the 'two-factor auth pin' in the 2FA registration view.");
 
     // Layout
-    [entryView autoPinEdgesToSuperviewMargins];
+    [entryView autoPinToTopLayoutGuideOfViewController:self withInset:0];
+    [entryView autoPinEdgeToSuperviewMargin:ALEdgeLeft];
+    [entryView autoPinEdgeToSuperviewMargin:ALEdgeRight];
+    [entryView autoPinToBottomLayoutGuideOfViewController:self withInset:0];
 }
 
 - (void)viewWillAppear:(BOOL)animated

Signal/src/call/NonCallKitCallUIAdaptee.swift

@@ -26,8 +26,6 @@ class NonCallKitCallUIAdaptee: NSObject, CallUIAdaptee {
         self.notificationsAdapter = notificationsAdapter
 
         super.init()
-
-        SwiftSingletons.register(self)
     }
 
     func startOutgoingCall(handle: String) -> SignalCall {

Signal/src/views/PinEntryView.m

@@ -116,7 +116,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)createContents
 {
-    const CGFloat kVSpacing = 30.f;
+    const CGFloat kVSpacing = ScaleFromIPhone5(12);
 
     UILabel *instructionsLabel = [self createLabelWithText:nil];
     self.instructionsLabel = instructionsLabel;