Merge "Fix tx_type bug in intra4x4 rd loop"