Merge "Merge branch 'ub-launcher3-master' into master"