diff --git a/Telegram-iOS/AppDelegate.swift b/Telegram-iOS/AppDelegate.swift
index d53a61cc5c..0513ce032c 100644
--- a/Telegram-iOS/AppDelegate.swift
+++ b/Telegram-iOS/AppDelegate.swift
@@ -202,11 +202,8 @@ final class SharedApplicationContext {
     }
     
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]? = nil) -> Bool {
-        if testIsLaunched {
-            return true
-        } else {
-            testIsLaunched = true
-        }
+        precondition(!testIsLaunched)
+        testIsLaunched = true
         
         let statusBarHost = ApplicationStatusBarHost()
         let (window, hostView) = nativeWindowHostView()
@@ -593,6 +590,7 @@ final class SharedApplicationContext {
         
         let sharedContextSignal = accountManagerSignal
         |> deliverOnMainQueue
+        |> take(1)
         |> mapToSignal { accountManager -> Signal<(SharedApplicationContext, LoggingSettings), NoError> in
             var initialPresentationDataAndSettings: InitialPresentationDataAndSettings?
             let semaphore = DispatchSemaphore(value: 0)
diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings
index 011623a1de..a98b555946 100644
--- a/Telegram-iOS/en.lproj/Localizable.strings
+++ b/Telegram-iOS/en.lproj/Localizable.strings
@@ -109,8 +109,9 @@
 "PUSH_MESSAGE_ROUNDS_1" = "%1$@|sent you a video message";
 "PUSH_MESSAGE_ROUNDS_any" = "%1$@|sent you %2$d video messages";
 "PUSH_MESSAGE" = "%1$@|sent you a message";
-"PUSH_MESSAGES_1" = "%1$@|sent you an album";
-"PUSH_MESSAGES_any" = "%1$@|sent you an album";
+"PUSH_MESSAGES_1" = "%1$@|sent you a message";
+"PUSH_MESSAGES_any" = "%1$@|sent you %2$d messages";
+"PUSH_MESSAGE_ALBUM" = "%1$@|sent you an album";
 
 "PUSH_CHANNEL_MESSAGE_TEXT" = "%1$@|%2$@";
 "PUSH_CHANNEL_MESSAGE_NOTEXT" = "%1$@|posted a message";
@@ -139,8 +140,9 @@
 "PUSH_CHANNEL_MESSAGE_ROUNDS_1" = "%1$@|posted a video message";
 "PUSH_CHANNEL_MESSAGE_ROUNDS_any" = "%1$@|posted %2$d video messages";
 "PUSH_CHANNEL_MESSAGE" = "%1$@|posted a message";
-"PUSH_CHANNEL_MESSAGES_1" = "%1$@|posted an album";
-"PUSH_CHANNEL_MESSAGES_any" = "%1$@|posted an album";
+"PUSH_CHANNEL_MESSAGES_1" = "%1$@|posted a message";
+"PUSH_CHANNEL_MESSAGES_any" = "%1$@|posted %2$d messages";
+"PUSH_CHANNEL_ALBUM" = "%1$@|posted an album";
 
 "PUSH_CHAT_MESSAGE_TEXT" = "%2$@|%1$@:%3$@";
 "PUSH_CHAT_MESSAGE_NOTEXT" = "%2$@|%1$@ sent a message to the group";
@@ -179,8 +181,9 @@
 "PUSH_CHAT_MESSAGE_ROUNDS_1" = "%2$@|%1$@ sent a video message";
 "PUSH_CHAT_MESSAGE_ROUNDS_any" = "%2$@|%1$@ sent %3$d video messages";
 "PUSH_CHAT_MESSAGE" = "%2$@|%1$@ sent a message";
-"PUSH_CHAT_MESSAGES_1" = "%2$@|%1$@ sent an album";
-"PUSH_CHAT_MESSAGES_any" = "%2$@|%1$@ sent an album";
+"PUSH_CHAT_MESSAGES_1" = "%2$@|%1$@ sent a message";
+"PUSH_CHAT_MESSAGES_any" = "%2$@|%1$@ sent %3$d messages";
+"PUSH_CHAT_ALBUM" = "%2$@|%1$@ sent an album";
 
 "PUSH_PINNED_TEXT" = "%1$@|pinned \"%2$@\" ";
 "PUSH_PINNED_NOTEXT" = "%1$@|pinned a message";
@@ -4213,3 +4216,5 @@ Unused sets are archived when you add more.";
 "Call.Flip" = "flip";
 "Call.End" = "end";
 "Call.Speaker" = "speaker";
+
+"MemberSearch.BotSection" = "BOTS";
diff --git a/submodules/Display b/submodules/Display
index c1b0117bf5..d80864dc37 160000
--- a/submodules/Display
+++ b/submodules/Display
@@ -1 +1 @@
-Subproject commit c1b0117bf5990c15c8a9af46ecdeced84a454f57
+Subproject commit d80864dc37cd4ac3aecae93d2d278051fbb8f921
diff --git a/submodules/Postbox b/submodules/Postbox
index eb594e3e90..73d45d3c87 160000
--- a/submodules/Postbox
+++ b/submodules/Postbox
@@ -1 +1 @@
-Subproject commit eb594e3e901bed366123daa60464fe285f97572a
+Subproject commit 73d45d3c87aa5837189521f41e4709a5d3780825
diff --git a/submodules/TelegramCore b/submodules/TelegramCore
index 624f916b0a..ab41021ba7 160000
--- a/submodules/TelegramCore
+++ b/submodules/TelegramCore
@@ -1 +1 @@
-Subproject commit 624f916b0a990e635b8076acbf92014798c4249a
+Subproject commit ab41021ba7e7d73e248b30cd5b4277720311fce7
diff --git a/submodules/TelegramUI b/submodules/TelegramUI
index 9630e0ea80..9db1562966 160000
--- a/submodules/TelegramUI
+++ b/submodules/TelegramUI
@@ -1 +1 @@
-Subproject commit 9630e0ea8004ad448ff616e250055b7f2bd8e73a
+Subproject commit 9db156296688ff0fb5afdf67aa5b3bf6c72baecb