Merge "Add icon to TeeView leaf nodes for clarity"