Merge "Properly normalize HBD sse computation" into nextgenv2