[stable-20.0] Messages are no longer lost in between lifecycle events

[stable-20.0] Messages are no longer lost in between lifecycle events #5748