Merge "Use standard rounding in intra filters." into nextgenv2