Merge "Fixing task misalignment" into ub-launcher3-edmonton