Avoid stale mapping in conversation view.

// FREEBIE

Signal/src/ViewControllers/ConversationView/MessagesViewController.m

@@ -548,8 +548,6 @@ typedef enum : NSUInteger {
 
     [self ensureBannerState];
 
-    [self resetContentAndLayout];
-
     [super viewWillAppear:animated];
 
     // In case we're dismissing a CNContactViewController which requires default system appearance
@@ -571,6 +569,8 @@ typedef enum : NSUInteger {
     }];
     [self updateMessageMappingRangeOptions];
     
+    [self resetContentAndLayout];
+
     [self toggleObservers:YES];
 
     // restart any animations that were stopped e.g. while inspecting the contact info screens.