Merge "New Bookmark Import wizard" into honeycomb-mr1