Merge "Add ClientState for handling the crash of clients." into lmp-preview-dev