diff --git a/app/src/androidTest/assets/backupTests/account_data_00.binproto b/app/src/androidTest/assets/backupTests/account_data_00.binproto
index 96e14f0da9..809799036e 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_00.binproto and b/app/src/androidTest/assets/backupTests/account_data_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_01.binproto b/app/src/androidTest/assets/backupTests/account_data_01.binproto
index 3982fc0ed1..196e498488 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_01.binproto and b/app/src/androidTest/assets/backupTests/account_data_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_02.binproto b/app/src/androidTest/assets/backupTests/account_data_02.binproto
index 9ad096e592..cc6d644cad 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_02.binproto and b/app/src/androidTest/assets/backupTests/account_data_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_03.binproto b/app/src/androidTest/assets/backupTests/account_data_03.binproto
index b73f74d586..6cad3b59fb 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_03.binproto and b/app/src/androidTest/assets/backupTests/account_data_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_04.binproto b/app/src/androidTest/assets/backupTests/account_data_04.binproto
index 2cf8511ee7..2b55a0bb36 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_04.binproto and b/app/src/androidTest/assets/backupTests/account_data_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_05.binproto b/app/src/androidTest/assets/backupTests/account_data_05.binproto
index c6765718c3..3f7a434cd0 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_05.binproto and b/app/src/androidTest/assets/backupTests/account_data_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_06.binproto b/app/src/androidTest/assets/backupTests/account_data_06.binproto
index a5e0a552c2..99e0b7b19c 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_06.binproto and b/app/src/androidTest/assets/backupTests/account_data_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_07.binproto b/app/src/androidTest/assets/backupTests/account_data_07.binproto
index bdef273e6d..251ca5f7df 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_07.binproto and b/app/src/androidTest/assets/backupTests/account_data_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_08.binproto b/app/src/androidTest/assets/backupTests/account_data_08.binproto
index 2946755f00..5996df3a8c 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_08.binproto and b/app/src/androidTest/assets/backupTests/account_data_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_09.binproto b/app/src/androidTest/assets/backupTests/account_data_09.binproto
index 41597c4812..3533dc9798 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_09.binproto and b/app/src/androidTest/assets/backupTests/account_data_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_10.binproto b/app/src/androidTest/assets/backupTests/account_data_10.binproto
index 2519b026e6..34ed41b300 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_10.binproto and b/app/src/androidTest/assets/backupTests/account_data_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_11.binproto b/app/src/androidTest/assets/backupTests/account_data_11.binproto
index a172e0b945..2f17a75129 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_11.binproto and b/app/src/androidTest/assets/backupTests/account_data_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_12.binproto b/app/src/androidTest/assets/backupTests/account_data_12.binproto
index 3156f1772b..07a80b660b 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_12.binproto and b/app/src/androidTest/assets/backupTests/account_data_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_13.binproto b/app/src/androidTest/assets/backupTests/account_data_13.binproto
index c9b55f0628..ad6e9640b8 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_13.binproto and b/app/src/androidTest/assets/backupTests/account_data_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_14.binproto b/app/src/androidTest/assets/backupTests/account_data_14.binproto
index fb7b279d9f..649aa9e663 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_14.binproto and b/app/src/androidTest/assets/backupTests/account_data_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_15.binproto b/app/src/androidTest/assets/backupTests/account_data_15.binproto
index f7d589b0ec..501bba6ed6 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_15.binproto and b/app/src/androidTest/assets/backupTests/account_data_15.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_16.binproto b/app/src/androidTest/assets/backupTests/account_data_16.binproto
index 77c9cf779b..7b56fd9e1b 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_16.binproto and b/app/src/androidTest/assets/backupTests/account_data_16.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_17.binproto b/app/src/androidTest/assets/backupTests/account_data_17.binproto
index 0d57808a3c..b148acc2c6 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_17.binproto and b/app/src/androidTest/assets/backupTests/account_data_17.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_18.binproto b/app/src/androidTest/assets/backupTests/account_data_18.binproto
index 17e253c258..44610b33d7 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_18.binproto and b/app/src/androidTest/assets/backupTests/account_data_18.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_19.binproto b/app/src/androidTest/assets/backupTests/account_data_19.binproto
index b82d80d5cd..10c8714b6f 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_19.binproto and b/app/src/androidTest/assets/backupTests/account_data_19.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_20.binproto b/app/src/androidTest/assets/backupTests/account_data_20.binproto
index a4b98e0375..f26f6d9976 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_20.binproto and b/app/src/androidTest/assets/backupTests/account_data_20.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_21.binproto b/app/src/androidTest/assets/backupTests/account_data_21.binproto
index 0b965123c6..ecfce596a6 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_21.binproto and b/app/src/androidTest/assets/backupTests/account_data_21.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_22.binproto b/app/src/androidTest/assets/backupTests/account_data_22.binproto
index ba2e658109..40fa9b6a6f 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_22.binproto and b/app/src/androidTest/assets/backupTests/account_data_22.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_23.binproto b/app/src/androidTest/assets/backupTests/account_data_23.binproto
index a919839fb5..97413574d8 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_23.binproto and b/app/src/androidTest/assets/backupTests/account_data_23.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_24.binproto b/app/src/androidTest/assets/backupTests/account_data_24.binproto
index 7dbb0bab79..2a5f2ae9be 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_24.binproto and b/app/src/androidTest/assets/backupTests/account_data_24.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_25.binproto b/app/src/androidTest/assets/backupTests/account_data_25.binproto
index 52acdaadb1..bfd1140266 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_25.binproto and b/app/src/androidTest/assets/backupTests/account_data_25.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_26.binproto b/app/src/androidTest/assets/backupTests/account_data_26.binproto
index 0ea9df26b9..b6de8087cd 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_26.binproto and b/app/src/androidTest/assets/backupTests/account_data_26.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_27.binproto b/app/src/androidTest/assets/backupTests/account_data_27.binproto
index 6fbe499e4e..65f21ae451 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_27.binproto and b/app/src/androidTest/assets/backupTests/account_data_27.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/ad_hoc_call_00.binproto b/app/src/androidTest/assets/backupTests/ad_hoc_call_00.binproto
index 36f43f413f..e2090bbacb 100644
Binary files a/app/src/androidTest/assets/backupTests/ad_hoc_call_00.binproto and b/app/src/androidTest/assets/backupTests/ad_hoc_call_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/ad_hoc_call_01.binproto b/app/src/androidTest/assets/backupTests/ad_hoc_call_01.binproto
index 5c9017477d..81983d08d7 100644
Binary files a/app/src/androidTest/assets/backupTests/ad_hoc_call_01.binproto and b/app/src/androidTest/assets/backupTests/ad_hoc_call_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/ad_hoc_call_02.binproto b/app/src/androidTest/assets/backupTests/ad_hoc_call_02.binproto
index af2be7af06..bf68e29ad6 100644
Binary files a/app/src/androidTest/assets/backupTests/ad_hoc_call_02.binproto and b/app/src/androidTest/assets/backupTests/ad_hoc_call_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/android_account_data_00.binproto b/app/src/androidTest/assets/backupTests/android_account_data_00.binproto
index a979faf1cc..ca83fb7244 100644
Binary files a/app/src/androidTest/assets/backupTests/android_account_data_00.binproto and b/app/src/androidTest/assets/backupTests/android_account_data_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/android_account_data_01.binproto b/app/src/androidTest/assets/backupTests/android_account_data_01.binproto
index f212011c5e..5153728ef3 100644
Binary files a/app/src/androidTest/assets/backupTests/android_account_data_01.binproto and b/app/src/androidTest/assets/backupTests/android_account_data_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_00.binproto b/app/src/androidTest/assets/backupTests/chat_00.binproto
index c45a39bb2e..ff681a3cff 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_00.binproto and b/app/src/androidTest/assets/backupTests/chat_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_01.binproto b/app/src/androidTest/assets/backupTests/chat_01.binproto
index 01125b44dd..5faf25b91e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_01.binproto and b/app/src/androidTest/assets/backupTests/chat_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_02.binproto b/app/src/androidTest/assets/backupTests/chat_02.binproto
index 987684872e..ba7ecabe7b 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_02.binproto and b/app/src/androidTest/assets/backupTests/chat_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_03.binproto b/app/src/androidTest/assets/backupTests/chat_03.binproto
index aa8f656b1e..e4f5deb111 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_03.binproto and b/app/src/androidTest/assets/backupTests/chat_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_04.binproto b/app/src/androidTest/assets/backupTests/chat_04.binproto
index a20048113e..3c671e0489 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_04.binproto and b/app/src/androidTest/assets/backupTests/chat_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_05.binproto b/app/src/androidTest/assets/backupTests/chat_05.binproto
index 567ed7e432..dad7adcc32 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_05.binproto and b/app/src/androidTest/assets/backupTests/chat_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_06.binproto b/app/src/androidTest/assets/backupTests/chat_06.binproto
index 3496a4cdba..f0183c83f7 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_06.binproto and b/app/src/androidTest/assets/backupTests/chat_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_07.binproto b/app/src/androidTest/assets/backupTests/chat_07.binproto
index c67b107f3e..3f9462d690 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_07.binproto and b/app/src/androidTest/assets/backupTests/chat_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_08.binproto b/app/src/androidTest/assets/backupTests/chat_08.binproto
index 0b0616d107..9c2392d0b6 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_08.binproto and b/app/src/androidTest/assets/backupTests/chat_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_09.binproto b/app/src/androidTest/assets/backupTests/chat_09.binproto
index 0b8c94e844..62912d3c25 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_09.binproto and b/app/src/androidTest/assets/backupTests/chat_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_10.binproto b/app/src/androidTest/assets/backupTests/chat_10.binproto
index c195d5ec99..210dc5910d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_10.binproto and b/app/src/androidTest/assets/backupTests/chat_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_11.binproto b/app/src/androidTest/assets/backupTests/chat_11.binproto
index cc3a9108d4..24a63a0ac4 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_11.binproto and b/app/src/androidTest/assets/backupTests/chat_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_12.binproto b/app/src/androidTest/assets/backupTests/chat_12.binproto
index 85f53dc56a..c991416ca1 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_12.binproto and b/app/src/androidTest/assets/backupTests/chat_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_13.binproto b/app/src/androidTest/assets/backupTests/chat_13.binproto
index 3931520086..eed095a97d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_13.binproto and b/app/src/androidTest/assets/backupTests/chat_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_14.binproto b/app/src/androidTest/assets/backupTests/chat_14.binproto
index cc0cb362b5..fca53bcc5c 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_14.binproto and b/app/src/androidTest/assets/backupTests/chat_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_15.binproto b/app/src/androidTest/assets/backupTests/chat_15.binproto
index c19b7c8315..9f4b5712e5 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_15.binproto and b/app/src/androidTest/assets/backupTests/chat_15.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_16.binproto b/app/src/androidTest/assets/backupTests/chat_16.binproto
index 2ef56c45b2..7a68760266 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_16.binproto and b/app/src/androidTest/assets/backupTests/chat_16.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_17.binproto b/app/src/androidTest/assets/backupTests/chat_17.binproto
index b03fb92a91..e8108c5ee2 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_17.binproto and b/app/src/androidTest/assets/backupTests/chat_17.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_18.binproto b/app/src/androidTest/assets/backupTests/chat_18.binproto
index ea5f8567c9..8e83a2b5df 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_18.binproto and b/app/src/androidTest/assets/backupTests/chat_18.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_19.binproto b/app/src/androidTest/assets/backupTests/chat_19.binproto
index 5bfa29cca3..b0bb4ebb4e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_19.binproto and b/app/src/androidTest/assets/backupTests/chat_19.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_20.binproto b/app/src/androidTest/assets/backupTests/chat_20.binproto
index 4d80dd99fc..a7d4e45e08 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_20.binproto and b/app/src/androidTest/assets/backupTests/chat_20.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_21.binproto b/app/src/androidTest/assets/backupTests/chat_21.binproto
index b61a0cd72b..9851f7579c 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_21.binproto and b/app/src/androidTest/assets/backupTests/chat_21.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_22.binproto b/app/src/androidTest/assets/backupTests/chat_22.binproto
index d3c78fd8b8..e06d178e2b 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_22.binproto and b/app/src/androidTest/assets/backupTests/chat_22.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_23.binproto b/app/src/androidTest/assets/backupTests/chat_23.binproto
index 1a15e5b01d..0793ce9d8b 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_23.binproto and b/app/src/androidTest/assets/backupTests/chat_23.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_24.binproto b/app/src/androidTest/assets/backupTests/chat_24.binproto
index 5ede45bddd..adffdcc8f3 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_24.binproto and b/app/src/androidTest/assets/backupTests/chat_24.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_25.binproto b/app/src/androidTest/assets/backupTests/chat_25.binproto
index c1408b835a..b9982c14bf 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_25.binproto and b/app/src/androidTest/assets/backupTests/chat_25.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_26.binproto b/app/src/androidTest/assets/backupTests/chat_26.binproto
index 8ef1917b2d..71d938824e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_26.binproto and b/app/src/androidTest/assets/backupTests/chat_26.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_folder_00.binproto b/app/src/androidTest/assets/backupTests/chat_folder_00.binproto
index 7b5b3b3d9f..051f41794a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_folder_00.binproto and b/app/src/androidTest/assets/backupTests/chat_folder_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_folder_01.binproto b/app/src/androidTest/assets/backupTests/chat_folder_01.binproto
index 88a7c9e46e..7c20db67b9 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_folder_01.binproto and b/app/src/androidTest/assets/backupTests/chat_folder_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_folder_02.binproto b/app/src/androidTest/assets/backupTests/chat_folder_02.binproto
index 8d23d3add4..e4e8fab76e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_folder_02.binproto and b/app/src/androidTest/assets/backupTests/chat_folder_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_folder_03.binproto b/app/src/androidTest/assets/backupTests/chat_folder_03.binproto
index 2856ba78cf..653dc98c3a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_folder_03.binproto and b/app/src/androidTest/assets/backupTests/chat_folder_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_contact_message_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_contact_message_00.binproto
index 11692d6677..f2cdecca30 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_contact_message_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_contact_message_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_contact_message_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_contact_message_01.binproto
index 0c16a13e0f..08652edad2 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_contact_message_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_contact_message_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_contact_message_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_contact_message_02.binproto
index 7c5d596003..bf580bbb94 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_contact_message_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_contact_message_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_contact_message_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_contact_message_03.binproto
index d8273d83fc..a943e9f889 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_contact_message_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_contact_message_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_contact_message_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_contact_message_04.binproto
index 82a12b51cb..4c41e6673c 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_contact_message_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_contact_message_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_contact_message_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_contact_message_05.binproto
index 40d72be80f..0ed54280fc 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_contact_message_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_contact_message_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_contact_message_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_contact_message_06.binproto
index 0762254e99..8b57828373 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_contact_message_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_contact_message_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_contact_message_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_contact_message_07.binproto
index 71188c1d2f..1e0ff981d2 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_contact_message_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_contact_message_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_contact_message_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_contact_message_08.binproto
index bf60aa77ed..cfed3246e0 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_contact_message_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_contact_message_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_contact_message_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_contact_message_09.binproto
index 204716fa8f..cefbd801ef 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_contact_message_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_contact_message_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_contact_message_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_contact_message_10.binproto
index 450fbf7199..d763990cc2 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_contact_message_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_contact_message_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_contact_message_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_contact_message_11.binproto
index 7b1615e168..0892e298fc 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_contact_message_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_contact_message_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_contact_message_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_contact_message_12.binproto
index 4e678b98e5..7dd08dcdc3 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_contact_message_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_contact_message_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_contact_message_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_contact_message_13.binproto
index 7494805492..d5bb63742f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_contact_message_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_contact_message_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_contact_message_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_contact_message_14.binproto
index 20663cef31..009a77bd67 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_contact_message_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_contact_message_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_00.binproto
index 95c3c6d99e..680f73d8f0 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_01.binproto
index 839f26b839..104579febf 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_02.binproto
index bb497404bd..d26da632c7 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_03.binproto
index cb4389c848..c308248f00 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_04.binproto
index 0634567f0f..d1f008f472 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_05.binproto
index 6d0a7e870a..28ace207a6 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_06.binproto
index 86f10c6100..b057918b41 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_07.binproto
index 0787bb3a25..9c2c53c84e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_08.binproto
index 94da89c778..95d719ff90 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_09.binproto
index f8a5c6ded1..32caf26255 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_10.binproto
index 32f26a51bf..3e197cb4e6 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_11.binproto
index 904828045d..6b0a2c9eac 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_12.binproto
index 822b2d826c..399d26d94a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_13.binproto
index 34e22e4854..27eef12199 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_14.binproto
index 01a8fc673d..7ba25aaaa2 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_00.binproto
index 83420a67e1..459ef8fae1 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_01.binproto
index 9348928c28..f739600ca4 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_02.binproto
index b0a0d2aaf1..5be3bb8ddb 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_03.binproto
index 953507ab9d..3a33e2a1d7 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_04.binproto
index 84b7a991a3..7396641fcb 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_05.binproto
index cb0010340d..f1ce16a0ef 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_06.binproto
index 6f0334f1a3..1a596f780c 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_07.binproto
index 46f88dce04..d0f6af0f92 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_08.binproto
index a4bc18ba8f..ed3f032d6a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_09.binproto
index a4635c46be..01eadfaa9c 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_10.binproto
index 6e9b36ef13..b1f0249fe7 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_expiration_timer_update_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_expiration_timer_update_00.binproto
index 796df7110d..a6c7611dcb 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_expiration_timer_update_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_expiration_timer_update_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_expiration_timer_update_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_expiration_timer_update_01.binproto
index e79287dd19..e8b46c2fcd 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_expiration_timer_update_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_expiration_timer_update_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_expiration_timer_update_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_expiration_timer_update_02.binproto
index 589bdadacf..2a33b70cea 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_expiration_timer_update_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_expiration_timer_update_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_00.binproto
index dc3a1d41b3..72486fb2cf 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_01.binproto
index 987aef3e61..210e2a06e3 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_02.binproto
index 27143a6339..5879d89cce 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_03.binproto
index e9bc3b5f62..df431cd8c9 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_04.binproto
index 8b0f240abb..89ae63a9d6 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_05.binproto
index 61326abe17..2255d9bce4 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_06.binproto
index 26743ae31a..edd70b5d1a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_07.binproto
index b9ec8a1574..008f94d346 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_08.binproto
index 3a56fe223a..57ecf15934 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_09.binproto
index fabc2f8a09..db997760f8 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_10.binproto
index a6cd1a4fb8..29d4220477 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_11.binproto
index 88056cefe4..6d25983d6a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_12.binproto
index 63677c340f..cb58b4ab1e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_13.binproto
index 57976dcd45..eb42e94f19 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_14.binproto
index cc4418d952..286e7a4aeb 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_call_update_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_call_update_00.binproto
index ff0af33cfc..f250bd9e99 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_call_update_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_call_update_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_call_update_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_call_update_01.binproto
index e08f1f38b1..4105c0bf77 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_call_update_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_call_update_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_call_update_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_call_update_02.binproto
index bd22a07502..fc91b3e530 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_call_update_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_call_update_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_call_update_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_call_update_03.binproto
index 5fb50a87cd..03b9b2c8e1 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_call_update_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_call_update_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_call_update_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_call_update_04.binproto
index d23b726c25..23e8e45df8 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_call_update_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_call_update_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_call_update_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_call_update_05.binproto
index b05888d62a..69340dc3be 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_call_update_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_call_update_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_call_update_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_call_update_06.binproto
index 2a3eda451e..b92f4de803 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_call_update_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_call_update_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_call_update_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_call_update_07.binproto
index bc44560922..46777e1bd7 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_call_update_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_call_update_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_00.binproto
index 725139469b..a6aa85ca6f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_01.binproto
index 0a73dfee75..29c9cc9bd1 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_02.binproto
index e60879278d..d54308a179 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_03.binproto
index 483330cf13..8ca0f026e9 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_04.binproto
index da6b119c83..036b3d2d58 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_05.binproto
index 40341bbe0d..a03a1c8c5e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_06.binproto
index 43a0184475..117dd7d89e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_07.binproto
index 20c1446578..85ea552140 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_08.binproto
index d76db6727e..2be1914abf 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_09.binproto
index e58c7b104d..85e86c9219 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_10.binproto
index c5307d4198..0e8aedd042 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_11.binproto
index 3308cb4b14..93499af849 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_12.binproto
index a4f264c350..0271d72ca7 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_13.binproto
index 6ccb103db3..b0add9af18 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_14.binproto
index 893e900672..d580963736 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_15.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_15.binproto
index 4b37db02be..95320cdb45 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_15.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_15.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_16.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_16.binproto
index 3d6e6eddb1..2d786f02b3 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_16.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_16.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_00.binproto
index 432e139ad1..d74b74a8e3 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_01.binproto
index 1276ab76d5..a8c0c866e4 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_02.binproto
index bf8b64f8bb..393f27987c 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_03.binproto
index bee7aa4158..fbc3f6a528 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_04.binproto
index 11f054261c..4ed48c6846 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_05.binproto
index 33e05df740..a1b54a74d6 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_06.binproto
index 7e18c1c5fd..50ce1b0a44 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_07.binproto
index 5fd1b06943..e6c7f187e3 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_08.binproto
index 492cb40fde..52089df416 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_09.binproto
index 62100bd709..3b5892be7c 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_10.binproto
index a32b1e7ae0..0697e22ae9 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_11.binproto
index 221398de17..2557e0ef90 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_12.binproto
index 6c3c651261..52f8ce1557 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_13.binproto
index 610c34b388..36926db7c7 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_14.binproto
index 02465f2512..2623c46514 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_15.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_15.binproto
index 5673572de9..926acff080 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_15.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_15.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_16.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_16.binproto
index c3050950d5..484119074f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_16.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_16.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_17.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_17.binproto
index 0f7d0fc359..41e5490b6b 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_17.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_17.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_18.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_18.binproto
index 4ac421065b..d6cfda5535 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_18.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_18.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_19.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_19.binproto
index 29ca215225..cae365a617 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_19.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_19.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_20.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_20.binproto
index 97c2c15a9f..2af4be99f0 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_20.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_20.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_21.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_21.binproto
index 81ba0b4358..0fe57f25dd 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_21.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_21.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_22.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_22.binproto
index 63517d605b..bd691d52ef 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_22.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_22.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_23.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_23.binproto
index 91060782df..2d105b1ddb 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_23.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_23.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_24.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_24.binproto
index faf6cb8422..e707228471 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_24.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_24.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_25.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_25.binproto
index f39483305c..fa380eddec 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_25.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_25.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_26.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_26.binproto
index 27e324c51a..352a593261 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_26.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_26.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_27.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_27.binproto
index bf2bd078e4..09078a1339 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_27.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_27.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_28.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_28.binproto
index 6a992b6da9..77c11d4ef8 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_28.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_28.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_29.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_29.binproto
index af7f0b63b9..6b53a9d75d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_29.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_29.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_30.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_30.binproto
index 371ea02f52..51a5645447 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_30.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_30.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_31.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_31.binproto
index ee7a0d4b9c..eaa2ef159e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_31.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_31.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_32.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_32.binproto
index eada1df379..83e29a84c6 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_32.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_32.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_33.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_33.binproto
index 7d8294d67c..7d5e34c00d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_33.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_33.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_34.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_34.binproto
index eada1df379..83e29a84c6 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_34.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_34.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_35.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_35.binproto
index e453534aa0..73c37da494 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_35.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_35.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_36.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_36.binproto
index 3fd5def565..0ffa3a202e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_36.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_36.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_37.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_37.binproto
index 0700063fab..7736f136fa 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_37.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_37.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_38.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_38.binproto
index 9ef4dfea9c..3ad02180ba 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_38.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_38.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_39.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_39.binproto
index c2313947ab..c19fe1aea1 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_39.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_39.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_40.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_40.binproto
index 06953f7439..cef80ed814 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_40.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_40.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_41.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_41.binproto
index 11600f4e98..ee009eb388 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_41.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_41.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_42.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_42.binproto
index b2b22b7fa7..ea6b1635fc 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_42.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_42.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_43.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_43.binproto
index 80c4684c89..5470204a17 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_43.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_43.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_44.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_44.binproto
index a211887b2c..5f859a8544 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_44.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_44.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_45.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_45.binproto
index 0bbb4b512f..ca30b0e2c7 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_45.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_45.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_46.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_46.binproto
index f3afb3de19..161b8c4399 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_46.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_46.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_47.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_47.binproto
index 5b93e33bf6..a00ea85602 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_47.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_47.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_48.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_48.binproto
index a167b1175a..44dbc7c22a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_48.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_48.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_49.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_49.binproto
index 1fe6fd9983..00f75bdf29 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_49.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_49.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_50.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_50.binproto
index 045712473f..94f48c9bab 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_50.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_50.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_51.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_51.binproto
index 9223ba91af..791099fc8a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_51.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_51.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_52.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_52.binproto
index f6cfb6e4f7..c1561c09cb 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_52.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_52.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_53.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_53.binproto
index 8c5149f52f..baf2d186db 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_53.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_53.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_54.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_54.binproto
index 3c082ed642..e43e0e1a7f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_54.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_54.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_55.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_55.binproto
index 9e164ea335..012d22d1f6 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_55.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_55.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_56.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_56.binproto
index 213785d41a..4da623b2fa 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_56.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_56.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_57.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_57.binproto
index 953864982e..26403baa6e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_57.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_57.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_58.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_58.binproto
index 98224f14c5..89b3ebc77b 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_58.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_58.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_59.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_59.binproto
index a5e8fab2f1..8f201ac7ff 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_59.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_59.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_60.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_60.binproto
index afe22961d8..fc27b053aa 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_60.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_60.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_61.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_61.binproto
index 241f6bafd7..11a9082201 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_61.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_61.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_62.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_62.binproto
index 09cc313474..d6214b69be 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_62.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_62.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_63.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_63.binproto
index a88b9f6b40..b8a23f6f8a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_63.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_63.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_64.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_64.binproto
index 56cc28951c..f080de4973 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_64.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_64.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_65.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_65.binproto
index 9944e45e6e..22f8f92981 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_65.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_65.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_66.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_66.binproto
index b20936ec91..ba07241d13 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_66.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_66.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_67.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_67.binproto
index 10a301575f..d3b663a47d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_67.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_67.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_68.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_68.binproto
index 903022f733..fa9d495a20 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_68.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_68.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_69.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_69.binproto
index 10a301575f..d3b663a47d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_69.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_69.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_70.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_70.binproto
index abb53ba38c..642b29f611 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_70.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_70.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_71.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_71.binproto
index cfcaa6e5f4..7e4883a7fd 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_71.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_71.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_72.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_72.binproto
index 74a78b1613..ffa52e5094 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_72.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_72.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_73.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_73.binproto
index 5c43ea8a9e..1a6ac49fe2 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_73.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_73.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_74.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_74.binproto
index af086dc17d..c9d4e4a17d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_74.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_74.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_75.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_75.binproto
index bfa7935945..55b43bc04f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_75.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_75.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_76.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_76.binproto
index 0d5c0ef0a6..faae2e4eac 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_76.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_76.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_77.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_77.binproto
index d641a41237..c90075e9f2 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_77.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_77.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_78.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_78.binproto
index 0dfb9849ea..d3903e0bc0 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_78.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_78.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_individual_call_update_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_individual_call_update_00.binproto
index 839f43fc70..80241c39f8 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_individual_call_update_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_individual_call_update_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_individual_call_update_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_individual_call_update_01.binproto
index 634111488c..1d581903a3 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_individual_call_update_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_individual_call_update_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_individual_call_update_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_individual_call_update_02.binproto
index 5f6a158110..369c3cdad4 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_individual_call_update_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_individual_call_update_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_individual_call_update_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_individual_call_update_03.binproto
index 2fa50331a3..6b9560c424 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_individual_call_update_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_individual_call_update_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_00.binproto
index b0c47f94c1..c5e6243549 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_01.binproto
index 93525232a2..e63338c1c7 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_02.binproto
index b2aad4fd9a..de706a74ae 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_03.binproto
index f6c9c839bc..01477255e9 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_04.binproto
index d16fb2a0e1..e7fc79e01a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_00.binproto
index 484d0d57a6..e23cabbfb1 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_01.binproto
index e62ea7242f..8209c7bb37 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_02.binproto
index a30f3980aa..2b002f090b 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_03.binproto
index 8f53ce7a82..858684fb82 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_04.binproto
index 95c1f2d582..c4b4656b10 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_05.binproto
index 1f57b740e3..727216cf55 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_06.binproto
index 8300686944..61403bb5fc 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_07.binproto
index 67fc3571b4..9f271608c6 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_08.binproto
index 973e22fe7c..c893ec29bb 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_09.binproto
index 25dc9296b2..c1bbb51eab 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_10.binproto
index bbe1c5c37d..eee298eaf2 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_11.binproto
index eda455418d..81a405b3ae 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_12.binproto
index 5c69c3747d..b948bf32ba 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_13.binproto
index a0f6889458..f0526c4612 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_14.binproto
index 91f2cd6830..7d0917ef86 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_00.binproto
index 4e45520ad0..8affca5658 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_01.binproto
index 79bc59cdf4..9563592ecb 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_02.binproto
index 3c57be6844..d1d8f16253 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_03.binproto
index 6e44ade04b..9346f3935c 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_04.binproto
index 8193fefa91..75792b7cec 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_05.binproto
index 1258a81b9f..95320aaa4b 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_06.binproto
index 6691408e3f..73365bd26c 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_07.binproto
index f143fb52db..29c97bd9c6 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_08.binproto
index b77cd1a087..3a4734a2a7 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_09.binproto
index 14f5856bb6..05f02b613c 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_10.binproto
index 860aebceab..8004a147b1 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_11.binproto
index a13ef76657..ad1e8ff752 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_12.binproto
index 16b1929385..4425364c54 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_13.binproto
index 3e78bac708..109f9b733c 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_14.binproto
index 4c6a72ca75..b17f9dc328 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_00.binproto
index 979de33e3e..3b701e94f0 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_01.binproto
index 50f98b2d37..d9c9c95019 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_02.binproto
index 0fe7e04867..06e104c029 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_03.binproto
index 1d50bd3a1e..a29538b6a3 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_04.binproto
index e0bca9ccd3..466769c718 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_05.binproto
index 1cb4e269f6..a7de5dd5a0 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_06.binproto
index 49ec4286b0..e372abe5f2 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_07.binproto
index c4ff7f89a9..408fc921ff 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_08.binproto
index 83f18509ab..2f2788d808 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_09.binproto
index 1cc30bc49b..451241efed 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_10.binproto
index b418c2140a..ce6f062f8e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_11.binproto
index b867c3ef54..73b6f725ce 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_12.binproto
index 89a103f657..9d7d97a68f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_13.binproto
index 80734afdca..d090be8414 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_14.binproto
index 26619f4b41..0a000e8676 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_15.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_15.binproto
index 11fa8432d7..e80bb028ab 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_15.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_15.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_16.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_16.binproto
index 55ad2183e1..5dc4fd3fb5 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_16.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_16.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_17.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_17.binproto
index 153cdbf418..f3aabe7d98 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_17.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_17.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_terminate_update_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_terminate_update_00.binproto
index 576e417d60..d245996c61 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_terminate_update_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_terminate_update_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_terminate_update_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_terminate_update_01.binproto
index 0c67e1358a..ca5a732a19 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_terminate_update_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_terminate_update_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_profile_change_update_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_profile_change_update_00.binproto
index 2d9eb97b57..2e5746b4c0 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_profile_change_update_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_profile_change_update_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_profile_change_update_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_profile_change_update_01.binproto
index eef4cb542a..50f4512067 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_profile_change_update_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_profile_change_update_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_profile_change_update_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_profile_change_update_02.binproto
index 293fbdb639..fa26d96fd0 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_profile_change_update_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_profile_change_update_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_00.binproto
index 5fdc7216ab..d91198673b 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_01.binproto
index 83379414dc..99d550e06a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_02.binproto
index 40fd15dbd7..3582c5d276 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_03.binproto
index 3a1c4200f0..4503d949ed 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_04.binproto
index 0e452be620..e762249c87 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_05.binproto
index d4087bc6a2..ad0dc2dfc6 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_06.binproto
index b07cc0bae9..d0cbc258d9 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_07.binproto
index 1d1ad21c42..a10ec3f563 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_08.binproto
index 90dda4b595..38226df04d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_09.binproto
index e9a1070a3b..abdc0d0a75 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_10.binproto
index 5fdeaa5364..c50d68a771 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_11.binproto
index 319103d1c6..ce08a6dca8 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_12.binproto
index 1a04e9364a..08fff9a25e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_13.binproto
index 1e93aa0bcc..b7a5db6bc3 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_14.binproto
index 4cd8bb2737..a001e5570e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_session_switchover_update_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_session_switchover_update_00.binproto
index 6b1bd6b98a..1c26b8975d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_session_switchover_update_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_session_switchover_update_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_session_switchover_update_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_session_switchover_update_01.binproto
index 63b46455a5..f083b29980 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_session_switchover_update_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_session_switchover_update_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_00.binproto
index 195988235e..79fb636e12 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_01.binproto
index 3a4a6cbd9d..bdcdb44d05 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_02.binproto
index 3c3b8d04f5..700f0097e2 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_03.binproto
index 02b2027fd7..5ce3cc90f9 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_04.binproto
index 63d8f5d1cb..0c73b8cab4 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_05.binproto
index 500888ba2d..e1cd798eaa 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_06.binproto
index 1bc0b0b76d..c1c8b8d551 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_07.binproto
index 0766829649..629a0edd2b 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_08.binproto
index 7ee43ad676..e89c066472 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_09.binproto
index 5690e3a1ee..d4768b5047 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_10.binproto
index e248a85a06..5a310a7986 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_11.binproto
index 44303f2d1a..4775fa305f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_12.binproto
index 959ead2381..c2073d0d21 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_13.binproto
index a3eb98b067..60a7bc5413 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_14.binproto
index 868c1e5fab..7a5c84b23f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_15.binproto b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_15.binproto
index 38917eb24f..aa2f102aa0 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_15.binproto and b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_15.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_00.binproto
index 04ad7689af..dcaace87c4 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_01.binproto
index 9243541af3..ea89979331 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_02.binproto
index b51e9cbab0..b0b1c883e4 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_03.binproto
index c03754c7b6..0035c606c6 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_04.binproto
index 096e1b9d10..8209d5c08e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_05.binproto
index fb7dfaf3e0..b4622228d8 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_06.binproto
index 49ea3918d3..5d7a566252 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_07.binproto
index 2edeaa3cba..5294ed9e93 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_08.binproto
index 4e2d1919d8..dcab869b27 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_09.binproto
index bce166fb51..24fe50c047 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_10.binproto
index 43285dba7c..bfe950b94a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_11.binproto
index 2197be20b3..7c5fb08318 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_12.binproto
index 9da8739245..dfe87558ae 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_13.binproto
index 6c78dfc934..144b3c98cf 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_14.binproto
index da7c460582..f3e0eaffbc 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_00.binproto
index 31c36263ae..e0549d3fe5 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_01.binproto
index c92f472695..c668cf54a3 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_02.binproto
index 8a006e9a4c..ef303458de 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_03.binproto
index f6a9a02b9b..575a415f4e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_04.binproto
index c547d735ce..6575ad9d69 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_05.binproto
index 2b175dc91a..85d6b76704 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_06.binproto
index 39e637fe4d..879dc3b888 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_07.binproto
index 8ca8a048d6..1b716ede20 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_08.binproto
index 803ef96b20..8bc07480bc 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_09.binproto
index cd76c2ad44..999b29815b 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_10.binproto
index c552e4f08e..1d36152b7c 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_11.binproto
index 06e54613d4..41f55f2ba7 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_12.binproto
index 0c030bc5b0..11654cd893 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_13.binproto
index d3a12f45b0..1d50ccf188 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_14.binproto
index 380343e53b..74c836d320 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_00.binproto
index 172678982f..a384ae0ff2 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_01.binproto
index d6bf6bbd34..80d864ff54 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_02.binproto
index 1ad89d235b..90780d53de 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_03.binproto
index 5751cc269f..2b6870e137 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_04.binproto
index 4ccb6f9615..31d06f5d00 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_05.binproto
index 3ed6f04e41..fea9bdb5d2 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_06.binproto
index 25404d75ec..da10dbe2a8 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_07.binproto
index b1b503793e..31c06e220f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_08.binproto
index b620f8ffd2..d413883d10 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_09.binproto
index c7909ce0e6..2add008bf2 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_10.binproto
index a9a63741a4..22aff1a758 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_11.binproto
index 8c6aee7cc4..da7c77636a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_12.binproto
index 60505f9819..19a3144a4f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_13.binproto
index 912beb2d4b..a8bd273e16 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_14.binproto
index 2bef647d9e..956a9deb91 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_00.binproto
index 8166530f26..159e7d1b02 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_01.binproto
index f65f74c9b3..b1a30bafbc 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_02.binproto
index 20e2f9e9e1..6c70149881 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_03.binproto
index 3ba746f757..4ce8315419 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_04.binproto
index 2c04626733..c3551ba08a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_05.binproto
index 4d3f4ca5d1..5dff40daff 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_06.binproto
index e312e82efc..385b2f1a9f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_07.binproto
index 89d948302c..95607bd3f3 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_08.binproto
index 849149fa5d..13386b6bbd 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_09.binproto
index d9ac739a14..f18497c0ad 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_10.binproto
index 0d959f9810..4847ad0c27 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_11.binproto
index cd2be53032..f87943e3bf 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_12.binproto
index 26f10df792..1dc9d9bc0c 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_13.binproto
index a5588a5a9c..8b35aa8470 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_14.binproto
index 667d2d3d14..fe350e6f3a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_00.binproto
index 53b6ac4e91..3bc6e280da 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_01.binproto
index b2e1cc2729..5121bb75ae 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_02.binproto
index bbb16a8494..de69d51d23 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_03.binproto
index dbb7fd7480..1d1398f1b4 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_04.binproto
index c2445e60ce..f523123ac4 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_05.binproto
index 5d80f7ba29..db61e8c265 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_06.binproto
index 10632b4225..6d5065fdb0 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_07.binproto
index 2229cd47f2..d20a4f23a8 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_08.binproto
index 48925e998a..607d16fbf4 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_09.binproto
index 2608914384..5c8a3980e6 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_10.binproto
index 9735722459..5e6b5d33a4 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_11.binproto
index d632d18124..3844818fdf 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_12.binproto
index 0273ca5134..74f629fe78 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_13.binproto
index 65a6508ffe..38df71c453 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_14.binproto
index b09bec9d90..7e1c801e0a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_00.binproto
index a390049406..069ba4f28a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_01.binproto
index abbc9a3bae..c296544029 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_02.binproto
index 27e513fd80..09035d0d16 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_03.binproto
index ac19c142ab..11766913b0 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_04.binproto
index 25a2a248b2..e8b5be677d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_05.binproto
index 08ea1ca136..b213385d86 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_06.binproto
index 7f0356e2c3..09e40c6d49 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_07.binproto
index 325cf580b9..c0ad4feb6c 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_08.binproto
index 63a2f386b1..5cccb261bb 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_09.binproto
index 76e8e56de0..09f4ad5c06 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_10.binproto
index 50b92a0082..e153a19391 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_11.binproto
index 60dfe16bb2..e09532d138 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_12.binproto
index f564baf575..f8e89dd956 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_13.binproto
index cb24f0b576..2b07d30f28 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_14.binproto
index c64b0de026..feeecdacf3 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_00.binproto
index a390049406..069ba4f28a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_01.binproto
index abbc9a3bae..c296544029 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_02.binproto
index 27e513fd80..09035d0d16 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_03.binproto
index ac19c142ab..11766913b0 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_04.binproto
index 25a2a248b2..e8b5be677d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_05.binproto
index 08ea1ca136..b213385d86 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_06.binproto
index 7f0356e2c3..09e40c6d49 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_07.binproto
index 325cf580b9..c0ad4feb6c 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_08.binproto
index 63a2f386b1..5cccb261bb 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_09.binproto
index 76e8e56de0..09f4ad5c06 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_10.binproto
index 50b92a0082..e153a19391 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_11.binproto
index 60dfe16bb2..e09532d138 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_12.binproto
index f564baf575..f8e89dd956 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_13.binproto
index cb24f0b576..2b07d30f28 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_14.binproto
index c64b0de026..feeecdacf3 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_00.binproto
index e35c6020bc..28703f1303 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_01.binproto
index c2bacdc848..ed12888fe4 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_02.binproto
index 106be236fe..a0c092d68f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_03.binproto
index 58d73403dd..bc27cd2a0b 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_04.binproto
index 04567d0bbb..05e4fa61f6 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_05.binproto
index d59cdd6ec0..05872bb3db 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_06.binproto
index e9a9096337..c073077129 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_07.binproto
index 55dc41fd4b..d0f8535e49 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_08.binproto
index 24fe0a975f..71a8180cbf 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_09.binproto
index d6a3e387c8..7666bf5d42 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_10.binproto
index 39920b0c21..6946e3fe84 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_11.binproto
index fa938c9079..e33475ac5e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_12.binproto
index 0073fb6fc7..15bc30bbbd 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_13.binproto
index f4edd57af9..1e3f6793be 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_14.binproto
index 3de985f6ad..ba6432b774 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_00.binproto
index 9cf352071a..e7bb819f7a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_01.binproto
index 3e830dbb7d..3985e0a607 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_02.binproto
index 00395b0776..e3bc5237aa 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_00.binproto
index bbf9a0d8ff..ad9a3bc107 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_01.binproto
index 1f80ea5d8e..4ca0d79684 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_02.binproto
index e9d0964356..c1b040bf40 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_03.binproto
index a71296c06f..e5c51114dd 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_04.binproto
index 5f2ab5fc6a..be4e567b1d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_05.binproto
index 1a65ebcea8..f11f32c675 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_06.binproto
index f4fbfb1fbb..28eb725b81 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_07.binproto
index 3163976eb2..890621d20f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_08.binproto
index d30c37664b..581669a08b 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_09.binproto
index fe4be42936..84f356ece5 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_10.binproto
index fd4f84b644..c250e13cf7 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_11.binproto
index a8f9bd89ef..0c71c4ac4a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_12.binproto
index deed174523..d6118e42cd 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_13.binproto
index 6e5f7013b3..f1fd1c2e9b 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_14.binproto
index 1cb85a4d2d..2498ec0a0e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_00.binproto
index 95401d3846..7fa519d524 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_01.binproto
index e73af2dfdb..62e4bf7098 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_02.binproto
index f1d3f25eda..1de1ee271c 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_03.binproto
index 3611827771..253f89c2d1 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_04.binproto
index 701723e7e4..147bcd7f22 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_05.binproto
index 996844086c..d78dbfd8ac 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_06.binproto
index aa2f5a02c2..ee9f3db96a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_07.binproto
index 227c01c831..101ec53296 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_08.binproto
index 312168bb43..14d5473cfc 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_09.binproto
index 6df51e5a96..e1ed6d4e9f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_10.binproto
index f39b1552fd..6b0cef7340 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_11.binproto
index 64bf86ccba..7ce94f9725 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_12.binproto
index 8c1d58c2cc..9825ef613f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_13.binproto
index 05059c5336..206640a48e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_14.binproto
index 04be33c113..4602bb4e71 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_00.binproto
index 17b17d4631..8fb52fa7c2 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_01.binproto
index 277be556b3..b783900f2c 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_02.binproto
index e047366310..3e7222bc42 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_03.binproto
index b8db11bd65..e8f2cb3fa8 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_04.binproto
index 46835fc218..4313775c3d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_05.binproto
index 322a3806c8..96ab56ed7c 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_06.binproto
index 9e776d9291..ffae34b9ef 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_07.binproto
index 0012f13688..b6a04c9cb7 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_08.binproto
index bff67eda68..b975d0ed5b 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_09.binproto
index 313f7dbc09..8760c0e2fa 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_10.binproto
index 0a34267fa9..66e0faa96d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_11.binproto
index 024ae236f3..f0224f7ca9 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_12.binproto
index 0e1b4b8346..dc8b0062b3 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_13.binproto
index c42cb06154..81f4f35de1 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_14.binproto
index 192330dc4f..c3d7e29012 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_thread_merge_update_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_thread_merge_update_00.binproto
index 1644a7a02e..1a91a0eee4 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_thread_merge_update_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_thread_merge_update_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_thread_merge_update_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_thread_merge_update_01.binproto
index 22dc0db47d..dce5c6a521 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_thread_merge_update_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_thread_merge_update_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_00.binproto
index 97873ad541..11f48fd996 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_01.binproto
index e82ea20aac..c6fc35feac 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_02.binproto
index 5ea7e93563..92ff18edac 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_03.binproto
index 45f160fae1..c1c2236f47 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_04.binproto
index b3568df43d..8406edc951 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_05.binproto
index 150ce96054..9f6576fa1d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_06.binproto
index 51c7925410..f23d5e1660 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_07.binproto
index b7d3076904..38e7fad8cb 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_08.binproto
index 5f9fd88c66..f5af09f222 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_09.binproto
index 6e1c40afc6..72996f60e2 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_10.binproto
index ddc8257d34..20714eebc7 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_11.binproto
index 7add28685e..6a90e8522a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_12.binproto
index 91aacc147a..1aa947a636 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/notification_profile_00.binproto b/app/src/androidTest/assets/backupTests/notification_profile_00.binproto
index befbee8ed1..c7fad4cd03 100644
Binary files a/app/src/androidTest/assets/backupTests/notification_profile_00.binproto and b/app/src/androidTest/assets/backupTests/notification_profile_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/notification_profile_01.binproto b/app/src/androidTest/assets/backupTests/notification_profile_01.binproto
index d64ca63c53..9cbda79f0f 100644
Binary files a/app/src/androidTest/assets/backupTests/notification_profile_01.binproto and b/app/src/androidTest/assets/backupTests/notification_profile_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/notification_profile_02.binproto b/app/src/androidTest/assets/backupTests/notification_profile_02.binproto
index 4082d10a24..6142bffa8d 100644
Binary files a/app/src/androidTest/assets/backupTests/notification_profile_02.binproto and b/app/src/androidTest/assets/backupTests/notification_profile_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/notification_profile_03.binproto b/app/src/androidTest/assets/backupTests/notification_profile_03.binproto
index ed65ef67cf..1e9346ed87 100644
Binary files a/app/src/androidTest/assets/backupTests/notification_profile_03.binproto and b/app/src/androidTest/assets/backupTests/notification_profile_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/notification_profile_04.binproto b/app/src/androidTest/assets/backupTests/notification_profile_04.binproto
index 388820f9af..e11966123b 100644
Binary files a/app/src/androidTest/assets/backupTests/notification_profile_04.binproto and b/app/src/androidTest/assets/backupTests/notification_profile_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/notification_profile_05.binproto b/app/src/androidTest/assets/backupTests/notification_profile_05.binproto
index ceb39d2232..0b2bb7f3b7 100644
Binary files a/app/src/androidTest/assets/backupTests/notification_profile_05.binproto and b/app/src/androidTest/assets/backupTests/notification_profile_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/notification_profile_06.binproto b/app/src/androidTest/assets/backupTests/notification_profile_06.binproto
index 3017be8a80..28d17f2323 100644
Binary files a/app/src/androidTest/assets/backupTests/notification_profile_06.binproto and b/app/src/androidTest/assets/backupTests/notification_profile_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/notification_profile_07.binproto b/app/src/androidTest/assets/backupTests/notification_profile_07.binproto
index 3600362a73..f5517799a8 100644
Binary files a/app/src/androidTest/assets/backupTests/notification_profile_07.binproto and b/app/src/androidTest/assets/backupTests/notification_profile_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/notification_profile_08.binproto b/app/src/androidTest/assets/backupTests/notification_profile_08.binproto
index 240e7b0186..670876af92 100644
Binary files a/app/src/androidTest/assets/backupTests/notification_profile_08.binproto and b/app/src/androidTest/assets/backupTests/notification_profile_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/notification_profile_09.binproto b/app/src/androidTest/assets/backupTests/notification_profile_09.binproto
index 36f2c4100d..21654a8bcf 100644
Binary files a/app/src/androidTest/assets/backupTests/notification_profile_09.binproto and b/app/src/androidTest/assets/backupTests/notification_profile_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/notification_profile_10.binproto b/app/src/androidTest/assets/backupTests/notification_profile_10.binproto
index f1dbbec923..8948fd2d48 100644
Binary files a/app/src/androidTest/assets/backupTests/notification_profile_10.binproto and b/app/src/androidTest/assets/backupTests/notification_profile_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/notification_profile_11.binproto b/app/src/androidTest/assets/backupTests/notification_profile_11.binproto
index 61cbae7494..88de7b9298 100644
Binary files a/app/src/androidTest/assets/backupTests/notification_profile_11.binproto and b/app/src/androidTest/assets/backupTests/notification_profile_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_call_link_00.binproto b/app/src/androidTest/assets/backupTests/recipient_call_link_00.binproto
index a3ce21959b..b2506e4b87 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_call_link_00.binproto and b/app/src/androidTest/assets/backupTests/recipient_call_link_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_call_link_01.binproto b/app/src/androidTest/assets/backupTests/recipient_call_link_01.binproto
index d79ac48e21..e35d4ec69e 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_call_link_01.binproto and b/app/src/androidTest/assets/backupTests/recipient_call_link_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_call_link_02.binproto b/app/src/androidTest/assets/backupTests/recipient_call_link_02.binproto
index 7cf793cd73..f59036c068 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_call_link_02.binproto and b/app/src/androidTest/assets/backupTests/recipient_call_link_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_call_link_03.binproto b/app/src/androidTest/assets/backupTests/recipient_call_link_03.binproto
index 193ab376ce..e6e6f7eac3 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_call_link_03.binproto and b/app/src/androidTest/assets/backupTests/recipient_call_link_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_call_link_04.binproto b/app/src/androidTest/assets/backupTests/recipient_call_link_04.binproto
index a4112c5424..a3b9409bd8 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_call_link_04.binproto and b/app/src/androidTest/assets/backupTests/recipient_call_link_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_call_link_05.binproto b/app/src/androidTest/assets/backupTests/recipient_call_link_05.binproto
index 7bf1e85793..fb5b9c722a 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_call_link_05.binproto and b/app/src/androidTest/assets/backupTests/recipient_call_link_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_call_link_06.binproto b/app/src/androidTest/assets/backupTests/recipient_call_link_06.binproto
index a3ce21959b..b2506e4b87 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_call_link_06.binproto and b/app/src/androidTest/assets/backupTests/recipient_call_link_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_call_link_07.binproto b/app/src/androidTest/assets/backupTests/recipient_call_link_07.binproto
index d79ac48e21..e35d4ec69e 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_call_link_07.binproto and b/app/src/androidTest/assets/backupTests/recipient_call_link_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_call_link_08.binproto b/app/src/androidTest/assets/backupTests/recipient_call_link_08.binproto
index 7cf793cd73..f59036c068 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_call_link_08.binproto and b/app/src/androidTest/assets/backupTests/recipient_call_link_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_call_link_09.binproto b/app/src/androidTest/assets/backupTests/recipient_call_link_09.binproto
index 193ab376ce..e6e6f7eac3 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_call_link_09.binproto and b/app/src/androidTest/assets/backupTests/recipient_call_link_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_call_link_10.binproto b/app/src/androidTest/assets/backupTests/recipient_call_link_10.binproto
index a4112c5424..a3b9409bd8 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_call_link_10.binproto and b/app/src/androidTest/assets/backupTests/recipient_call_link_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_call_link_11.binproto b/app/src/androidTest/assets/backupTests/recipient_call_link_11.binproto
index 7bf1e85793..fb5b9c722a 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_call_link_11.binproto and b/app/src/androidTest/assets/backupTests/recipient_call_link_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_call_link_12.binproto b/app/src/androidTest/assets/backupTests/recipient_call_link_12.binproto
index a3ce21959b..b2506e4b87 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_call_link_12.binproto and b/app/src/androidTest/assets/backupTests/recipient_call_link_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_call_link_13.binproto b/app/src/androidTest/assets/backupTests/recipient_call_link_13.binproto
index d79ac48e21..e35d4ec69e 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_call_link_13.binproto and b/app/src/androidTest/assets/backupTests/recipient_call_link_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_call_link_14.binproto b/app/src/androidTest/assets/backupTests/recipient_call_link_14.binproto
index 7cf793cd73..f59036c068 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_call_link_14.binproto and b/app/src/androidTest/assets/backupTests/recipient_call_link_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_call_link_15.binproto b/app/src/androidTest/assets/backupTests/recipient_call_link_15.binproto
index 193ab376ce..e6e6f7eac3 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_call_link_15.binproto and b/app/src/androidTest/assets/backupTests/recipient_call_link_15.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_contacts_00.binproto b/app/src/androidTest/assets/backupTests/recipient_contacts_00.binproto
index a287605375..f179d5fd9a 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_contacts_00.binproto and b/app/src/androidTest/assets/backupTests/recipient_contacts_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_contacts_01.binproto b/app/src/androidTest/assets/backupTests/recipient_contacts_01.binproto
index 3f437d856e..ae66e9e84b 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_contacts_01.binproto and b/app/src/androidTest/assets/backupTests/recipient_contacts_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_contacts_02.binproto b/app/src/androidTest/assets/backupTests/recipient_contacts_02.binproto
index 944f67abf2..f1a4573412 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_contacts_02.binproto and b/app/src/androidTest/assets/backupTests/recipient_contacts_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_contacts_03.binproto b/app/src/androidTest/assets/backupTests/recipient_contacts_03.binproto
index c3a4679be6..26c64f3374 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_contacts_03.binproto and b/app/src/androidTest/assets/backupTests/recipient_contacts_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_contacts_04.binproto b/app/src/androidTest/assets/backupTests/recipient_contacts_04.binproto
index 80ce70c566..fce435e55d 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_contacts_04.binproto and b/app/src/androidTest/assets/backupTests/recipient_contacts_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_contacts_05.binproto b/app/src/androidTest/assets/backupTests/recipient_contacts_05.binproto
index d95bf7dcd0..7075992c83 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_contacts_05.binproto and b/app/src/androidTest/assets/backupTests/recipient_contacts_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_contacts_06.binproto b/app/src/androidTest/assets/backupTests/recipient_contacts_06.binproto
index d4d38f4afe..353cd6489f 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_contacts_06.binproto and b/app/src/androidTest/assets/backupTests/recipient_contacts_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_contacts_07.binproto b/app/src/androidTest/assets/backupTests/recipient_contacts_07.binproto
index 6a5d993cb9..8e3c9b78b8 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_contacts_07.binproto and b/app/src/androidTest/assets/backupTests/recipient_contacts_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_contacts_08.binproto b/app/src/androidTest/assets/backupTests/recipient_contacts_08.binproto
index ee8066c1bb..9055b7dfef 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_contacts_08.binproto and b/app/src/androidTest/assets/backupTests/recipient_contacts_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_contacts_09.binproto b/app/src/androidTest/assets/backupTests/recipient_contacts_09.binproto
index b745061799..123340c48e 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_contacts_09.binproto and b/app/src/androidTest/assets/backupTests/recipient_contacts_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_contacts_10.binproto b/app/src/androidTest/assets/backupTests/recipient_contacts_10.binproto
index 064d8f6ca9..29e59f34c6 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_contacts_10.binproto and b/app/src/androidTest/assets/backupTests/recipient_contacts_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_contacts_11.binproto b/app/src/androidTest/assets/backupTests/recipient_contacts_11.binproto
index 611daf08a3..ecf5b8ffd0 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_contacts_11.binproto and b/app/src/androidTest/assets/backupTests/recipient_contacts_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_distribution_list_00.binproto b/app/src/androidTest/assets/backupTests/recipient_distribution_list_00.binproto
index eb985fde00..57c114c7a7 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_distribution_list_00.binproto and b/app/src/androidTest/assets/backupTests/recipient_distribution_list_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_distribution_list_01.binproto b/app/src/androidTest/assets/backupTests/recipient_distribution_list_01.binproto
index 60127b0d9d..dad6c2b7fc 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_distribution_list_01.binproto and b/app/src/androidTest/assets/backupTests/recipient_distribution_list_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_distribution_list_02.binproto b/app/src/androidTest/assets/backupTests/recipient_distribution_list_02.binproto
index 73db5efd99..051c29a192 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_distribution_list_02.binproto and b/app/src/androidTest/assets/backupTests/recipient_distribution_list_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_distribution_list_03.binproto b/app/src/androidTest/assets/backupTests/recipient_distribution_list_03.binproto
index aa8ae7ea54..d158805522 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_distribution_list_03.binproto and b/app/src/androidTest/assets/backupTests/recipient_distribution_list_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_groups_00.binproto b/app/src/androidTest/assets/backupTests/recipient_groups_00.binproto
index a067b93de9..e088fc99e1 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_groups_00.binproto and b/app/src/androidTest/assets/backupTests/recipient_groups_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_groups_01.binproto b/app/src/androidTest/assets/backupTests/recipient_groups_01.binproto
index c58077585d..41f8824a1e 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_groups_01.binproto and b/app/src/androidTest/assets/backupTests/recipient_groups_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_groups_02.binproto b/app/src/androidTest/assets/backupTests/recipient_groups_02.binproto
index a632233219..faeac16433 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_groups_02.binproto and b/app/src/androidTest/assets/backupTests/recipient_groups_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_groups_03.binproto b/app/src/androidTest/assets/backupTests/recipient_groups_03.binproto
index 81c3a3d619..c02f0c0a85 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_groups_03.binproto and b/app/src/androidTest/assets/backupTests/recipient_groups_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_groups_04.binproto b/app/src/androidTest/assets/backupTests/recipient_groups_04.binproto
index b48943e829..930a79e898 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_groups_04.binproto and b/app/src/androidTest/assets/backupTests/recipient_groups_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_groups_05.binproto b/app/src/androidTest/assets/backupTests/recipient_groups_05.binproto
index 30a5eacd20..c48ab8fb6a 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_groups_05.binproto and b/app/src/androidTest/assets/backupTests/recipient_groups_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_groups_06.binproto b/app/src/androidTest/assets/backupTests/recipient_groups_06.binproto
index 98db637340..4b0f1485b3 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_groups_06.binproto and b/app/src/androidTest/assets/backupTests/recipient_groups_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_groups_07.binproto b/app/src/androidTest/assets/backupTests/recipient_groups_07.binproto
index e900b86890..bfb900653f 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_groups_07.binproto and b/app/src/androidTest/assets/backupTests/recipient_groups_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_groups_08.binproto b/app/src/androidTest/assets/backupTests/recipient_groups_08.binproto
index 1b4135fe1f..b29155f8fd 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_groups_08.binproto and b/app/src/androidTest/assets/backupTests/recipient_groups_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_groups_09.binproto b/app/src/androidTest/assets/backupTests/recipient_groups_09.binproto
index 6156d92905..a31943b8d3 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_groups_09.binproto and b/app/src/androidTest/assets/backupTests/recipient_groups_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_groups_10.binproto b/app/src/androidTest/assets/backupTests/recipient_groups_10.binproto
index 534496c757..da50aa3387 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_groups_10.binproto and b/app/src/androidTest/assets/backupTests/recipient_groups_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_groups_11.binproto b/app/src/androidTest/assets/backupTests/recipient_groups_11.binproto
index ebb7011dd0..785aaf0fb9 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_groups_11.binproto and b/app/src/androidTest/assets/backupTests/recipient_groups_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_self_00.binproto b/app/src/androidTest/assets/backupTests/recipient_self_00.binproto
index 7e00660f4b..b06c1308ef 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_self_00.binproto and b/app/src/androidTest/assets/backupTests/recipient_self_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_self_01.binproto b/app/src/androidTest/assets/backupTests/recipient_self_01.binproto
index 6df95fdf3c..b9010479f6 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_self_01.binproto and b/app/src/androidTest/assets/backupTests/recipient_self_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_self_02.binproto b/app/src/androidTest/assets/backupTests/recipient_self_02.binproto
index db317c6c92..716879fd0b 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_self_02.binproto and b/app/src/androidTest/assets/backupTests/recipient_self_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_self_03.binproto b/app/src/androidTest/assets/backupTests/recipient_self_03.binproto
index 17219fa6ea..8fe590c799 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_self_03.binproto and b/app/src/androidTest/assets/backupTests/recipient_self_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_self_04.binproto b/app/src/androidTest/assets/backupTests/recipient_self_04.binproto
index c5ca390ebd..d3bf97ca58 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_self_04.binproto and b/app/src/androidTest/assets/backupTests/recipient_self_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_self_05.binproto b/app/src/androidTest/assets/backupTests/recipient_self_05.binproto
index f6bc3a8060..bb42fec4a8 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_self_05.binproto and b/app/src/androidTest/assets/backupTests/recipient_self_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_self_06.binproto b/app/src/androidTest/assets/backupTests/recipient_self_06.binproto
index ed14f0289b..9a62747f6f 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_self_06.binproto and b/app/src/androidTest/assets/backupTests/recipient_self_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_self_07.binproto b/app/src/androidTest/assets/backupTests/recipient_self_07.binproto
index 2594ce18ed..e9c1facb8a 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_self_07.binproto and b/app/src/androidTest/assets/backupTests/recipient_self_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_self_08.binproto b/app/src/androidTest/assets/backupTests/recipient_self_08.binproto
index cdd5e2e542..35ca68e225 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_self_08.binproto and b/app/src/androidTest/assets/backupTests/recipient_self_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_self_09.binproto b/app/src/androidTest/assets/backupTests/recipient_self_09.binproto
index 445f6d6e21..f6c7d45c3e 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_self_09.binproto and b/app/src/androidTest/assets/backupTests/recipient_self_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_self_10.binproto b/app/src/androidTest/assets/backupTests/recipient_self_10.binproto
index 24c23c1202..97dda03c06 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_self_10.binproto and b/app/src/androidTest/assets/backupTests/recipient_self_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_self_11.binproto b/app/src/androidTest/assets/backupTests/recipient_self_11.binproto
index f63d050171..e868b67c8f 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_self_11.binproto and b/app/src/androidTest/assets/backupTests/recipient_self_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/standard_frames.binproto b/app/src/androidTest/assets/backupTests/standard_frames.binproto
index e5b2555329..7fd590224a 100644
Binary files a/app/src/androidTest/assets/backupTests/standard_frames.binproto and b/app/src/androidTest/assets/backupTests/standard_frames.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/sticker_pack_00.binproto b/app/src/androidTest/assets/backupTests/sticker_pack_00.binproto
index 546e989cd9..8cb982b08c 100644
Binary files a/app/src/androidTest/assets/backupTests/sticker_pack_00.binproto and b/app/src/androidTest/assets/backupTests/sticker_pack_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/sticker_pack_01.binproto b/app/src/androidTest/assets/backupTests/sticker_pack_01.binproto
index 546e989cd9..8cb982b08c 100644
Binary files a/app/src/androidTest/assets/backupTests/sticker_pack_01.binproto and b/app/src/androidTest/assets/backupTests/sticker_pack_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/sticker_pack_02.binproto b/app/src/androidTest/assets/backupTests/sticker_pack_02.binproto
index 546e989cd9..8cb982b08c 100644
Binary files a/app/src/androidTest/assets/backupTests/sticker_pack_02.binproto and b/app/src/androidTest/assets/backupTests/sticker_pack_02.binproto differ
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/AccountDataArchiveProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/AccountDataArchiveProcessor.kt
index 29831ce894..b6ce31238e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/AccountDataArchiveProcessor.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/AccountDataArchiveProcessor.kt
@@ -41,6 +41,7 @@ import org.thoughtcrime.securesms.keyvalue.SettingsValues
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
+import org.thoughtcrime.securesms.util.Environment
 import org.thoughtcrime.securesms.util.ProfileUtil
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.thoughtcrime.securesms.webrtc.CallDataMode
@@ -51,6 +52,8 @@ import org.whispersystems.signalservice.api.subscriptions.SubscriberId
 import org.whispersystems.signalservice.api.util.UuidUtil
 import org.whispersystems.signalservice.api.util.toByteArray
 import java.util.Currency
+import kotlin.time.Duration.Companion.minutes
+import kotlin.time.Duration.Companion.seconds
 
 /**
  * Handles importing/exporting [AccountData] frames for an archive.
@@ -75,7 +78,7 @@ object AccountDataArchiveProcessor {
 
     val screenLockTimeoutSeconds = signalStore.settingsValues.screenLockTimeout
     val screenLockTimeoutMinutes = if (screenLockTimeoutSeconds > 0) {
-      (screenLockTimeoutSeconds / 60).toInt()
+      screenLockTimeoutSeconds.seconds.inWholeMinutes.toInt()
     } else {
       null
     }
@@ -146,7 +149,7 @@ object AccountDataArchiveProcessor {
             useSystemEmoji = signalStore.settingsValues.isPreferSystemEmoji,
             screenshotSecurity = TextSecurePreferences.isScreenSecurityEnabled(context),
             navigationBarSize = signalStore.settingsValues.useCompactNavigationBar.toRemoteNavigationBarSize()
-          ),
+          ).takeUnless { Environment.IS_INSTRUMENTATION && SignalStore.backup.importedEmptyAndroidSettings },
           bioText = selfRecord.about ?: "",
           bioEmoji = selfRecord.aboutEmoji ?: ""
         )
@@ -172,7 +175,9 @@ object AccountDataArchiveProcessor {
     if (accountData.androidSpecificSettings != null) {
       SignalStore.settings.isPreferSystemEmoji = accountData.androidSpecificSettings.useSystemEmoji
       TextSecurePreferences.setScreenSecurityEnabled(context, accountData.androidSpecificSettings.screenshotSecurity)
-      SignalStore.settings.setUseCompactNavigationBar(accountData.androidSpecificSettings.navigationBarSize.toLocalNavigationBarSize())
+      SignalStore.settings.useCompactNavigationBar = accountData.androidSpecificSettings.navigationBarSize.toLocalNavigationBarSize()
+    } else if (Environment.IS_INSTRUMENTATION) {
+      SignalStore.backup.importedEmptyAndroidSettings = true
     }
 
     if (accountData.bioText.isNotBlank() || accountData.bioEmoji.isNotBlank()) {
@@ -275,7 +280,7 @@ object AccountDataArchiveProcessor {
     }
 
     if (settings.screenLockTimeoutMinutes != null) {
-      SignalStore.settings.screenLockTimeout = settings.screenLockTimeoutMinutes.toLong() * 60
+      SignalStore.settings.screenLockTimeout = settings.screenLockTimeoutMinutes.minutes.inWholeSeconds
     }
 
     if (settings.pinReminders != null) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/BackupValues.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/BackupValues.kt
index 65beb72ffc..c2a5e26de3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/BackupValues.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/BackupValues.kt
@@ -62,6 +62,7 @@ class BackupValues(store: KeyValueStore) : SignalStoreValues(store) {
     private const val KEY_RESTORE_OVER_CELLULAR = "backup.restore.useCellular"
     private const val KEY_OPTIMIZE_STORAGE = "backup.optimizeStorage"
     private const val KEY_BACKUPS_INITIALIZED = "backup.initialized"
+    private const val KEY_IMPORTED_EMPTY_ANDROID_SETTINGS = "backup.importedEmptyAndroidSettings"
 
     const val KEY_ARCHIVE_UPLOAD_STATE = "backup.archiveUploadState"
 
@@ -422,6 +423,11 @@ class BackupValues(store: KeyValueStore) : SignalStoreValues(store) {
         .apply()
     }
 
+  /**
+   * An annoying workaround to making tests pass when importing empty androidSpecificSettings.
+   */
+  var importedEmptyAndroidSettings by booleanValue(KEY_IMPORTED_EMPTY_ANDROID_SETTINGS, false)
+
   /**
    * If set, this represents how far back we should backup messages. For instance, if the returned value is 1 year in milliseconds, you should back up
    * every message within the last year. If unset, back up all messages. We only cutoff old messages for users whose backup is over the
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SettingsValues.java b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SettingsValues.java
index c41d9fece0..53bf403012 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SettingsValues.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SettingsValues.java
@@ -14,6 +14,7 @@ import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.mms.SentMediaQuality;
 import org.thoughtcrime.securesms.preferences.widgets.NotificationPrivacyPreference;
+import org.thoughtcrime.securesms.util.Environment;
 import org.thoughtcrime.securesms.util.SingleLiveEvent;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.webrtc.CallDataMode;
@@ -83,7 +84,7 @@ public final class SettingsValues extends SignalStoreValues {
   SettingsValues(@NonNull KeyValueStore store, Context context) {
     super(store);
 
-    if (!store.containsKey(SCREEN_LOCK_ENABLED)) {
+    if (!store.containsKey(SCREEN_LOCK_ENABLED) && !Environment.IS_INSTRUMENTATION) {
       migrateFromSharedPrefsV1(context);
     }
   }