Merge "Handle intra modes when tx type speed feature is enabled" into nextgenv2