Merge "Buffer size calculation corrections for NV12_2K"