Merge "Optimized HBD 4x4 variance calculation" into nextgenv2