Merge "Merge branch 'ub-launcher3-master' into launcher3merge2018-10-22"