Merge "Move redirect rendering into WikitextContent"