Merge "Move class HistoryPager to own file"