Merge "Revert "Converting even more tests to TAPL"" into ub-launcher3-qt-dev
am: 1703eb8b88

Change-Id: I570fadb5ff452f4363c4acddb3079ec076c14b71