Merge "Add shift stage for PSNRHVS computation" into nextgenv2