Merge "Implement type-to-focus in the DirectoryFragment." into nyc-dev