Merge "Break tile row dependencies." into nextgenv2