Merge "Speed up ext-intra inter frame encoding" into nextgenv2