Merge "Improve page display title handling for category pages"