Merge "History UI update" into honeycomb