Merge "Improving TAPL diags" into ub-launcher3-qt-dev
am: 8d513677ea

Change-Id: I3184b068dc147139a8d578f76807d26b8ea8c64d