Merge "Better diagnostics for waitForLauncherObject" into ub-launcher3-master