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

* commit '700fb3c23d56a14eef9c330c50278f02935f5a04':
  Revert "Change "hide checkboxes" to "show checkboxes""