am 971e5787: Merge "Revert "Replace legacy Browser with BookmarkProvider""

* commit '971e5787c0ebaa35f238bb99433cbfefd0bab50d':
  Revert "Replace legacy Browser with BookmarkProvider"