Merge "Show empty roots except for content pickers."