Merge "Conversation View UI Refresh: More message header." into jb-ub-mail-ur10