Merge "Make IndexPager query direction code more readable"