Merge "Revert "Replace legacy Browser with BookmarkProvider""