Merge "Add shift stage in FASTSSIM computation" into nextgenv2