Merge "Enabling history and paging by default"