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

Change-Id: I5a9b10bb7eab178f83d367f13f1d4bb67c5b81b3