Merge "Increasing wait time." into ub-launcher3-master