Merge "Cleanup in get_uv_tx_size" into nextgenv2