Merge "Category: Remove "todo" comment about moving code from CategoryPage"