am 69c8dd4b: Merge "Revert "Change "hide checkboxes" to "show checkboxes""" into jb-ub-mail-ur9

* commit '69c8dd4ba4b62c407dc6e22c4dfe1b0213cbdd20':
  Revert "Change "hide checkboxes" to "show checkboxes""