Merge "[incfs] Use a more efficient getBlockCount() for incfs v2" into sc-dev