Merge "Skip launcher return for custom task transitions" into main