Merge "Disable HBD 4x4 DCT_DCT HT test" into nextgenv2