Merge "Make bit-stream support rectangular tx_size" into nextgenv2