Merge "Cleanup psnr.h" into nextgenv2