Merge "Reduce intra transform set" into nextgenv2