Merge "Remove spinner item and unread count right padding" into jb-ub-mail