Merging chat-list-status-fix changes back