Merge "Temporary hacks to make tests pass on Taimen" into ub-launcher3-qt-dev
am: 7ff19aa560

Change-Id: Iffd29c6af69172f03143c1e67fa67d685bd0ec8d