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

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