Merge "Sampling too long Launcher tests" into tm-dev