Merge "Conversation View UI Refresh: Card Borders." into jb-ub-mail-ur10