Merge "init: fix StopSendingMessages()"