Merge "OOUI prefs: Use late static binding"