Merge "Add selected background to history groups" into honeycomb