Merge "The parent folder should be shown at the top of the list of child folders."