Merge "Replace Browser with Browser2 and BookmarkProvider"