Merge "Enabling some tests that seem to pass locally" into ub-launcher3-qt-dev
am: a0739a9763

Change-Id: Id5724e3afe7034e5a280c6fe04e0a5d053711913