Merge "Fix launcher-in-transition-targets detection" into sc-v2-dev