Merge "Refactor registration of OOjs UI resource modules"