Merge "Skip unnecessary calculations in ext-intra" into nextgenv2