Merge "Fix bug 5048082 - Conversation doesn't scroll after you send a message"