Merge "Properly update the local version when updating bookmarks."