Merge change 4094

* changes:
  Consolidate bookmark add/delete code in the browser.