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