Merge "optimize re-rendering a conversation for a single outgoing message" into jb-ub-mail