Merge "Reducing tests flakiness." into ub-launcher3-master