Merge "Refactor max_blocks_wide/high computation" into nextgenv2