Merge "Properly reset rate and distortion value for zero pred residual case" into nextgenv2