Merge "Add a secondary launcher activity (1/2)" into ub-launcher3-master