Merge change 26273 into eclair

* changes:
  Updates for bookmarks page.