Merge "Updated bookmark/widget assets" into honeycomb