Merge "Update OOjs UI to v0.22.4"