Merge "Fix overlapping unread and name in drawer" into jb-ub-mail-ur9