am ca0aba39: Merge commit \'54d5702c\' into manualmerge

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