am 821df858: am 5b98618f: am ca0aba39: Merge commit \'54d5702c\' into manualmerge

* commit '821df858fcc63be8cd7e53e6432a6a17d734412d':
  Fix incorrect setting of TaskRecord.frontOfTask.  DO NOT MERGE.