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