Merge "Improving TAPL diagnostics (contains changes in Launcher)" into ub-launcher3-master