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