Merge "Converting more tests to TAPL" into ub-launcher3-qt-dev
am: a730a233b8

Change-Id: I4d5e5f0489337f3fe95779a25f1ab6d801fe4340