Merge "Keeping task list stable across multiple task switches" into ub-launcher3-master