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

* commit '5bd5869115fa80cc4a94752e160d3df001d6d3d6':
  Revert "Replace legacy Browser with BookmarkProvider"