Merge "Call SystemUIFactory.prepareSysUIComponentBuilder even for tests"