Merge "IncFS: pass over the new .blocks_written IncFS control file"