am d121f184: Merge "Replace legacy Browser with BookmarkProvider"

* commit 'd121f18450520c4869a807533b4abf1adb1e846c':
  Replace legacy Browser with BookmarkProvider