Merge "Fix position of the senders view when showing contact photos instead of checkboxes." into jb-ub-mail-ur8