Merge "Re-sync OOjs and OOjs UI update scripts"