Merge "Change "hide checkboxes" to "show checkboxes"" into jb-ub-mail-ur8