Merge "ext-intra: completely remove floating point operations" into nextgenv2