Merge "Creating some common launcher targets" into ub-launcher3-edmonton-polish