Merge "Special case the root folder in add bookmarks" into ics-mr1