Merge "Remove presence from conversation view." into jb-ub-mail-ur10