Merge "Waiting until the launcher change is propagater before test"