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

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