Respond to CR.

Signal/src/ViewControllers/ConversationView/Cells/AttachmentUploadView.m

@@ -95,14 +95,10 @@ NS_ASSUME_NONNULL_BEGIN
     stackView.layoutMarginsRelativeArrangement = YES;
     [self addSubview:stackView];
     [stackView autoCenterInSuperview];
-    [NSLayoutConstraint
+    [stackView autoPinEdgeToSuperviewMargin:ALEdgeTop relation:NSLayoutRelationGreaterThanOrEqual];
-        autoSetPriority:UILayoutPriorityRequired
+    [stackView autoPinEdgeToSuperviewMargin:ALEdgeBottom relation:NSLayoutRelationGreaterThanOrEqual];
-         forConstraints:^{
+    [stackView autoPinEdgeToSuperviewMargin:ALEdgeLeading relation:NSLayoutRelationGreaterThanOrEqual];
-             [stackView autoPinEdgeToSuperviewMargin:ALEdgeTop relation:NSLayoutRelationGreaterThanOrEqual];
+    [stackView autoPinEdgeToSuperviewMargin:ALEdgeTrailing relation:NSLayoutRelationGreaterThanOrEqual];
-             [stackView autoPinEdgeToSuperviewMargin:ALEdgeBottom relation:NSLayoutRelationGreaterThanOrEqual];
-             [stackView autoPinEdgeToSuperviewMargin:ALEdgeLeading relation:NSLayoutRelationGreaterThanOrEqual];
-             [stackView autoPinEdgeToSuperviewMargin:ALEdgeTrailing relation:NSLayoutRelationGreaterThanOrEqual];
-         }];
 }
 
 - (void)setIsAttachmentReady:(BOOL)isAttachmentReady

Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m

@@ -473,12 +473,9 @@ NS_ASSUME_NONNULL_BEGIN
     [self insertAnyTextViewsIntoStackView:textViews];
 
     CGSize bubbleSize = [self measureSize];
-    [NSLayoutConstraint autoSetPriority:UILayoutPriorityRequired
+    [self.viewConstraints addObjectsFromArray:@[
-                         forConstraints:^{
+        [self autoSetDimension:ALDimensionWidth toSize:bubbleSize.width],
-                             [self.viewConstraints addObjectsFromArray:@[
+    ]];
-                                 [self autoSetDimension:ALDimensionWidth toSize:bubbleSize.width],
-                             ]];
-                         }];
     if (bodyMediaView) {
         OWSAssert(bodyMediaSize);
         [self.viewConstraints
@@ -977,7 +974,7 @@ NS_ASSUME_NONNULL_BEGIN
     UIImageView *videoPlayButton = [[UIImageView alloc] initWithImage:videoPlayIcon];
     [stillImageView addSubview:videoPlayButton];
     [videoPlayButton autoCenterInSuperview];
-    [self addAttachmentUploadViewIfNecessary:^(BOOL isAttachmentReady) {
+    [self addAttachmentUploadViewIfNecessaryWithAttachmentStateCallback:^(BOOL isAttachmentReady) {
         videoPlayButton.hidden = !isAttachmentReady;
     }];
 
@@ -1078,10 +1075,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)addAttachmentUploadViewIfNecessary
 {
-    [self addAttachmentUploadViewIfNecessary:nil];
+    [self addAttachmentUploadViewIfNecessaryWithAttachmentStateCallback:nil];
 }
 
-- (void)addAttachmentUploadViewIfNecessary:(nullable AttachmentStateBlock)attachmentStateCallback
+- (void)addAttachmentUploadViewIfNecessaryWithAttachmentStateCallback:
+    (nullable AttachmentStateBlock)attachmentStateCallback
 {
     OWSAssert(self.attachmentStream);
 

Signal/src/views/RemoteVideoView.m

@@ -48,10 +48,7 @@ NS_ASSUME_NONNULL_BEGIN
             // It's inner (private) MTKView is below the status bar.
             for (UIView *subview in [_videoRenderer subviews]) {
                 if ([subview isKindOfClass:[MTKView class]]) {
-                    [NSLayoutConstraint autoSetPriority:UILayoutPriorityRequired
+                    [subview autoPinEdgesToSuperviewEdges];
-                                         forConstraints:^{
-                                             [subview autoPinEdgesToSuperviewEdges];
-                                         }];
                 } else {
                     OWSFail(@"New subviews added to MTLVideoView. Reconsider this hack.");
                 }