Merge "Fix estimate_wedge_sign with high bit-depth." into nextgenv2