Merge "Fix a crash when browsing empty roots." into nyc-dev