Merge "Temporary workarounds to make tests pass on a virtual device" into ub-launcher3-qt-r1-dev
am: e46f9e5cf3

Change-Id: Ib221d9c201f2b396b138631d8548d1862d2e7643