Merge "Don't show TreeView element when empty"