Merge "Always update screenshots for bookmarks"