Merge "ext-intra: get rid of some floating operations." into nextgenv2