Merge "Fixing regression with launch target task."