Merge "Fix SpecialPageFactory list handling"