Merge "Conversation UI Visual Refresh: border fixes." into jb-ub-mail-ur10