Merge "No need to store the deringing filter direction variance in an array" into nextgenv2