Merge "Added a queued state to ConversationSendingState" into jb-ub-mail