Fix a couple small bugs in the typing indicators.

Signal/src/ViewControllers/ConversationView/Cells/TypingIndicatorCell.swift

@@ -125,11 +125,11 @@ public class TypingIndicatorCell: ConversationViewCell {
         let bubbleSize = CGSizeAdd(insetsSize, typingIndicatorSize)
 
         if shouldShowAvatar() {
-            let avatarSize = CGSize(width: kAvatarSize, height: kAvatarSize)
+            return CGSizeCeil(CGSize(width: kAvatarSize + kAvatarHSpacing + bubbleSize.width,
-            return CGSizeCeil(CGSize(width: avatarSize.width + kAvatarHSpacing + bubbleSize.width,
+                                     height: max(kAvatarSize, bubbleSize.height)))
-                                     height: max(avatarSize.height, bubbleSize.height)))
         } else {
-            return bubbleSize
+            return CGSizeCeil(CGSize(width: bubbleSize.width,
+                                     height: max(kAvatarSize, bubbleSize.height)))
         }
     }
 

SignalServiceKit/src/Messages/OWSMessageManager.m

@@ -663,6 +663,10 @@ NS_ASSUME_NONNULL_BEGIN
         OWSFailDebug(@"Missing typingMessage.");
         return;
     }
+    if (typingMessage.timestamp != envelope.timestamp) {
+        OWSFailDebug(@"typingMessage has invalid timestamp.");
+        return;
+    }
 
     TSThread *_Nullable thread;
     if (typingMessage.hasGroupID) {