Merge "Reducing test wait time from 60 sec to 10 sec" into ub-launcher3-qt-dev