Merge "Fixing race condition on test information provider" into ub-launcher3-master