Merge "Add more test diags" into ub-launcher3-qt-dev
am: 9ccc21b637

Change-Id: I0c555166162d6b16a18434fea4ccc438648825d8