Merge "Speed up ext-intra" into nextgenv2