892408 fix intermittent bookmarks resolution errors
Merge pull request #1121 from jsantell/892408-fix-intermittent-bookmarks-resolution

fix bug 892408 fix intermittent bookmarks resolution errors, r=@gozala