Merge "Misc. updates for highbd changes" into nextgenv2