Merge "Fix bookmarks context menu" into honeycomb