Merge "Do not crash when selecting a lot of files." into nyc-dev