am 5c64bfd4: am f3b7df2d: Merge "Display nested folder icon for folders with children" into ub-gmail-ur14-dev

* commit '5c64bfd42272c8b9fcf80023aa6829712f3dc890':
  Display nested folder icon for folders with children