Merge "Incfs: Add the new .blocks_written control file"