Merge "[Flexiglass] Reset the tracked HUN row at the end of the touch" into main