Merge "Fixing flakiness of widget tests" into ub-launcher3-qt-dev
am: 2d49d1de5f

Change-Id: Iffc973929e09869652508d81f2d7e0e2d8e17b6e