Merge "Small speed up for super_block_uvrd" into nextgenv2