Merge "Bookmarks listen for account pref changes" into honeycomb