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

Change-Id: I4ea2798cee12cb5e6250b01a135e1327ef3d1acc