Don't assume that trs are two wide, and transfer end tag stx

Change-Id: I98d091c66591bff2811f3b420f3a7c3c337c587c
Merge "Don't assume that trs are two wide, and transfer end tag stx"