Merge "Some cosmetic improvements since HBD variance 4x4 optimization" into nextgenv2