Merge "Fix PSNRHVS computation"