Merge "Fix OO.ui.infuse error on misc-authed-ooui module"