Merge "Add block size in pixels lookup table" into nextgenv2