Merge "Subclassing Launcher instead of using UiFactory" into ub-launcher3-master