move tx related state fields into sub-record
Merge bug25370