Merge "Tighten up loading of visible task data" into ub-launcher3-edmonton