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