am 4409358a: Merge "Special case the root folder in add bookmarks" into ics-mr1

* commit '4409358ac603ec61f42a1b40f90d8b2893d9ad0b':
  Special case the root folder in add bookmarks