Merge "Prevent encoder crash caused by row tile dependencies"