Merge "Set correct target position for other targets" into ub-launcher3-edmonton