Merge "Port change to highbitdepth code path" into nextgenv2