Merge "Show a remove button for existing bookmarks." into honeycomb