Merge "One thread to rule them all" into ub-launcher3-master