Merge "[incremental] labels for incfs and directory root"