Merge "Undo generalization isDownloads > supportsChildren." into nyc-dev