Merge "Limit the reset range of inter_tx_size array" into nextgenv2