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