Merge "Fix incorrect setting of TaskRecord.frontOfTask"