Merge "Using get_plane_block_{width, height} instead of custom code."