Merge "OOjs UI: Fix #gatherPreInfuseState called incorrectly, causing TypeErrors"