Merge "Revert "Use display name in category page subheadings if provided""