Merge change 3935 into donut

* changes:
  Hook the 12- or 24-hour time format checkbox back up.