Merge "Remove dead code from CategoryPager"