Merge "Fix memory leak in bookmarks page" into honeycomb