Merge "Replace legacy Browser with BookmarkProvider"