am 6824d968: am 700fb3c2: Merge "Revert "Change "hide checkboxes" to "show checkboxes""" into jb-ub-mail-ur9

* commit '6824d9683167226d3080d72f26f0f52c2ee8865c':
  Revert "Change "hide checkboxes" to "show checkboxes""